diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-05-17 12:52:01 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-05-17 12:52:01 (GMT) |
| commit | dd13a204909986c6516354347593b5282fef6743 (patch) | |
| tree | e05df99f42159421c19647a2b58dbb0648bcd3b1 | |
| parent | 6f84ed5afc0d1d43e01f2728207b6fb2cdafc5b5 (diff) | |
| download | cpython-dd13a204909986c6516354347593b5282fef6743.zip cpython-dd13a204909986c6516354347593b5282fef6743.tar.gz cpython-dd13a204909986c6516354347593b5282fef6743.tar.bz2 | |
Made distutils understand the MacPython Carbon runtime model. Distutils will build for the runtime model you are currently using for the interpreter.
| -rw-r--r-- | Lib/distutils/mwerkscompiler.py | 2 | ||||
| -rw-r--r-- | Lib/distutils/sysconfig.py | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Lib/distutils/mwerkscompiler.py b/Lib/distutils/mwerkscompiler.py index 2edc825..981fd95 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 91f9279..473faea 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") |