Fix distutils so that libffi will cross-compile between darwin/x86 and darwin/ppc

diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
index 6dad757a6a7906bce506f6f0a4e42bc4b7f1aa13..1349abeb65fd7e242f669ae0078117248c86f23f 100644 (file)
--- a/Lib/distutils/ccompiler.py
+++ b/Lib/distutils/ccompiler.py
@@ -15,7 +15,6 @@ from distutils.spawn import spawn
 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 @@ class CCompiler:
 
         # 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 @@ class CCompiler:
         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:

diff --git a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in
index 1a7a67a8193ef9bac8cd6e5542a86b9b14e510d0..3364049aeb06fde9ba7dbc6998c01fae692b4a65 100644 (file)
--- a/Modules/_ctypes/libffi/fficonfig.py.in
+++ b/Modules/_ctypes/libffi/fficonfig.py.in
@@ -29,7 +29,7 @@ ffi_platforms = {
 
 # 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: