Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 01:30:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

A more intelligent fix for LDSHARED

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-06-26 18:25:56 +00:00
parent 0fbc3d4f5d
commit 85e5a58cc8
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
buildtools/config.py
View File

@@ -25,6 +25,7 @@ from distutils.dir_util import mkpath
from distutils.dep_util import newer
from distutils.spawn import spawn
import distutils.sysconfig
runSilently = False
@@ -249,9 +250,28 @@ class Configuration(object):
if not os.environ.get('CC') or not os.environ.get('CXX'):
self.CC = os.environ["CC"] = self.getWxConfigValue('--cc')
self.CXX = os.environ["CXX"] = self.getWxConfigValue('--cxx')
self.LDSHARED = os.environ["LDSHARED"] = \
self.getWxConfigValue('--ld').replace(' -o', '') \
+ ' -bundle -undefined dynamic_lookup'
# We want to use the linker command from wx to make sure
# we get the right sysroot, but we also need to ensure that
# the other linker flags that distutils wants to use are
# included as well.
LDSHARED = distutils.sysconfig.get_config_var('LDSHARED').split()
# remove the compiler command
del LDSHARED[0]
# remove any -sysroot flags and their arg
while 1:
try:
index = LDSHARED.index('-isysroot')
# Strip this argument and the next one:
del LDSHARED[index:index+2]
except ValueError:
break
LDSHARED = ' '.join(LDSHARED)
# Combine with wx's ld command and stash it in the env
# where distutils will get it later.
LDSHARED = self.getWxConfigValue('--ld').replace(' -o', '') + ' ' + LDSHARED
os.environ["LDSHARED"] = LDSHARED
# wxGTK settings
else: