diff options
| -rw-r--r-- | setup.py | 10 | ||||
| m--------- | sources/pyside2 | 13 | ||||
| m--------- | sources/pyside2-tools | 0 | ||||
| m--------- | sources/shiboken2 | 13 |
4 files changed, 26 insertions, 10 deletions
@@ -160,6 +160,7 @@ OPTION_JOBS = option_value('jobs') # number of parallel build job OPTION_JOM = has_option('jom') # use jom instead of nmake with msvc OPTION_BUILDTESTS = has_option("build-tests") OPTION_OSXARCH = option_value("osx-arch") +OPTION_OSX_USE_LIBCPP = has_option("osx-use-libc++") OPTION_XVFB = has_option("use-xvfb") if OPTION_QT_VERSION is None: @@ -634,6 +635,15 @@ class pyside_build(_build): # also tell cmake which architecture to use cmake_cmd.append("-DCMAKE_OSX_ARCHITECTURES:STRING={}".format(OPTION_OSXARCH)) + if OPTION_OSX_USE_LIBCPP: + # Explicitly link the libc++ standard library (useful for osx deployment targets + # lower than 10.9). This is not on by default, because most libraries and + # executables on OSX <= 10.8 are linked to libstdc++, and mixing standard libraries + # can lead to crashes. + # On OSX >= 10.9 with a similar minimum deployment target, libc++ is linked in + # implicitly, thus the option is a no-op in those cases. + cmake_cmd.append("-DOSX_USE_LIBCPP=ON") + log.info("Configuring module %s (%s)..." % (extension, module_src_dir)) if run_process(cmake_cmd) != 0: raise DistutilsSetupError("Error configuring " + extension) diff --git a/sources/pyside2 b/sources/pyside2 -Subproject 131fdfd1a89a257094148c07c630f136752c703 +Subproject e64dda26eb2042a8c0cd7c8a33b134dcf097936 diff --git a/sources/pyside2-tools b/sources/pyside2-tools -Subproject 1eb5ccf5208d775e1e70b2332d9a61df0061280 +Subproject c8608f268f6461c421055ff3df1fd72d616cb64 diff --git a/sources/shiboken2 b/sources/shiboken2 -Subproject 9b4a3cfcee9cfd5a98c33b29ec4ecfd8d3e973f +Subproject 4ba52d8a955613985485b14faf76aa66bac08cc |