Commit ad647859 authored by Bob Ippolito's avatar Bob Ippolito

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

parent c6f5c871
...@@ -15,7 +15,6 @@ from distutils.spawn import spawn ...@@ -15,7 +15,6 @@ from distutils.spawn import spawn
from distutils.file_util import move_file from distutils.file_util import move_file
from distutils.dir_util import mkpath from distutils.dir_util import mkpath
from distutils.dep_util import newer_pairwise, newer_group from distutils.dep_util import newer_pairwise, newer_group
from distutils.sysconfig import python_build
from distutils.util import split_quoted, execute from distutils.util import split_quoted, execute
from distutils import log from distutils import log
...@@ -368,7 +367,7 @@ class CCompiler: ...@@ -368,7 +367,7 @@ class CCompiler:
# Get the list of expected output (object) files # Get the list of expected output (object) files
objects = self.object_filenames(sources, objects = self.object_filenames(sources,
strip_dir=python_build, strip_dir=0,
output_dir=outdir) output_dir=outdir)
assert len(objects) == len(sources) assert len(objects) == len(sources)
...@@ -475,8 +474,7 @@ class CCompiler: ...@@ -475,8 +474,7 @@ class CCompiler:
which source files can be skipped. which source files can be skipped.
""" """
# Get the list of expected output (object) files # Get the list of expected output (object) files
objects = self.object_filenames(sources, strip_dir=python_build, objects = self.object_filenames(sources, output_dir=output_dir)
output_dir=output_dir)
assert len(objects) == len(sources) assert len(objects) == len(sources)
if self.force: if self.force:
......
...@@ -29,7 +29,7 @@ ffi_platforms = { ...@@ -29,7 +29,7 @@ ffi_platforms = {
# Build all darwin related files on all supported darwin architectures, this # Build all darwin related files on all supported darwin architectures, this
# makes it easier to build universal binaries. # makes it easier to build universal binaries.
if 0: if 1:
all_darwin = ('X86_DARWIN', 'POWERPC_DARWIN') all_darwin = ('X86_DARWIN', 'POWERPC_DARWIN')
all_darwin_files = [] all_darwin_files = []
for pn in all_darwin: for pn in all_darwin:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment