X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b9db15f1e92e3083ee36f16aa654fb8b09922c10..7e0564433971698eadff8b232315e2fa75c26bf7:/wxPython/config.py?ds=sidebyside

diff --git a/wxPython/config.py b/wxPython/config.py
index 3b2de23850..47d330fb44 100644
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -39,7 +39,7 @@ import distutils.command.clean
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 7
 VER_RELEASE      = 0
-VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets
+VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
 VER_FLAGS        = "pre"  # release flags, such as prerelease or RC num, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
@@ -574,7 +574,7 @@ def adjustCFLAGS(cflags, defines, includes):
 
 
 
-def adjustLFLAGS(lfags, libdirs, libs):
+def adjustLFLAGS(lflags, libdirs, libs):
     '''Extract the -L and -l flags and put them in libdirs and libs as needed'''
     newLFLAGS = []
     for flag in lflags:
@@ -585,7 +585,11 @@ def adjustLFLAGS(lfags, libdirs, libs):
         else:
             newLFLAGS.append(flag)
 
-    return newLFLAGS
+    # remove any flags for universal binaries, we'll get those from
+    # distutils instead
+    return [flag for flag in newLFLAGS
+            if flag not in ['-isysroot', '-arch', 'ppc', 'i386'] and
+            not flag.startswith('/Developer') ]