From: Jack Jansen <jack.jansen@cwi.nl>
Date: Thu, 17 May 2001 12:52:01 +0000 (+0000)
Subject: Made distutils understand the MacPython Carbon runtime model. Distutils will build... 
X-Git-Tag: v2.2a3~1763
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd13a204909986c6516354347593b5282fef6743;p=thirdparty%2FPython%2Fcpython.git

Made distutils understand the MacPython Carbon runtime model. Distutils will build for the runtime model you are currently using for the interpreter.
---

diff --git a/Lib/distutils/mwerkscompiler.py b/Lib/distutils/mwerkscompiler.py
index 2edc8259bfd4..981fd95f01d8 100644
--- a/Lib/distutils/mwerkscompiler.py
+++ b/Lib/distutils/mwerkscompiler.py
@@ -114,6 +114,8 @@ class MWerksCompiler (CCompiler) :
         # into the project.
         if output_filename[-8:] == '.ppc.slb':
             basename = output_filename[:-8]
+        elif output_filename[-11:] == '.carbon.slb':
+            basename = output_filename[:-11]
         else:
             basename = os.path.strip(output_filename)[0]
         projectname = basename + '.mcp'
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index 91f9279d8755..473faea85e8c 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -339,7 +339,11 @@ def _init_mac():
     # XXX hmmm.. a normal install puts include files here
     g['INCLUDEPY'] = get_python_inc(plat_specific=0)
 
+    import MacOS
+    if not hasattr(MacOS, 'runtimemodel'):
     g['SO'] = '.ppc.slb'
+    else:
+        g['SO'] = '.%s.slb' % MacOS.runtimemodel
 
     # XXX are these used anywhere?
     g['install_lib'] = os.path.join(EXEC_PREFIX, "Lib")