From 852c00aab31693abc84e1bddea8bc5c8f1497a9f Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Wed, 11 Jul 2012 17:40:23 +0000 Subject: [PATCH] Only strip sysroot if it is specified in cc_args, if it is passed in via environment variables, keep it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- buildtools/distutils_hacks.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/buildtools/distutils_hacks.py b/buildtools/distutils_hacks.py index 360dbb38..d22f7682 100644 --- a/buildtools/distutils_hacks.py +++ b/buildtools/distutils_hacks.py @@ -17,7 +17,9 @@ import distutils.command.install import distutils.command.install_data import distutils.command.install_headers import distutils.command.clean + from distutils.dep_util import newer, newer_group +from distutils import log from .config import Config, posixjoin, loadETG, etg2sip @@ -41,7 +43,6 @@ class wx_extra_clean(distutils.command.clean.clean): --all flag was used also searches for .pyc, .pyd, .so files """ def run(self): - from distutils import log from distutils.filelist import FileList distutils.command.clean.clean.run(self) @@ -177,7 +178,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args): stripArch = stripSysroot = True else: stripArch = '-arch' in cc_args - stripSysroot = '-isysroot' in cc_args or stripArch or ccHasSysroot + stripSysroot = '-isysroot' in cc_args if stripArch: while 1: