[Python-checkins] r46331 - in python/trunk: Lib/distutils/ccompiler.py Modules/_ctypes/libffi/fficonfig.py.in

[bob.ippolito]

Author: bob.ippolito
Date: Fri May 26 16:07:23 2006
New Revision: 46331

Modified:
   python/trunk/Lib/distutils/ccompiler.py
   python/trunk/Modules/_ctypes/libffi/fficonfig.py.in
Log:
Fix distutils so that libffi will cross-compile between darwin/x86 and darwin/ppc

Modified: python/trunk/Lib/distutils/ccompiler.py
==============================================================================
--- python/trunk/Lib/distutils/ccompiler.py	(original)
+++ python/trunk/Lib/distutils/ccompiler.py	Fri May 26 16:07:23 2006
@@ -15,7 +15,6 @@
 from distutils.file_util import move_file
 from distutils.dir_util import mkpath
 from distutils.dep_util import newer_pairwise, newer_group
-from distutils.sysconfig import python_build
 from distutils.util import split_quoted, execute
 from distutils import log
 
@@ -368,7 +367,7 @@
 
         # Get the list of expected output (object) files
         objects = self.object_filenames(sources,
-                                        strip_dir=python_build,
+                                        strip_dir=0,
                                         output_dir=outdir)
         assert len(objects) == len(sources)
 
@@ -475,8 +474,7 @@
         which source files can be skipped.
         """
         # Get the list of expected output (object) files
-        objects = self.object_filenames(sources, strip_dir=python_build,
-                                        output_dir=output_dir)
+        objects = self.object_filenames(sources, output_dir=output_dir)
         assert len(objects) == len(sources)
 
         if self.force:

Modified: python/trunk/Modules/_ctypes/libffi/fficonfig.py.in
==============================================================================
--- python/trunk/Modules/_ctypes/libffi/fficonfig.py.in	(original)
+++ python/trunk/Modules/_ctypes/libffi/fficonfig.py.in	Fri May 26 16:07:23 2006
@@ -29,7 +29,7 @@
 
 # Build all darwin related files on all supported darwin architectures, this
 # makes it easier to build universal binaries.
-if 0:
+if 1:
     all_darwin = ('X86_DARWIN', 'POWERPC_DARWIN')
     all_darwin_files = []
     for pn in all_darwin: