aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-08-22 17:56:24 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-08-24 12:30:44 +0200
commit11322d4aba41aef022d7242057340b159cccaf53 (patch)
treee1d0ad21a393c0a71f9c3f25b7a63d0fa0ac3ab6
parenta790865e3159a12e427a6b55114bdbd05881ce9d (diff)
Fix Xcode sdk value embedded into PySide2 binaries
Previously when building on the Coin VMs, the incorrect Xcode sdk value of "10.0" was embedded into all the built shiboken and PySide2 binaries. This causes issues when trying to notarize a PySide2 app. The reason why this happens is described as a long investigation on the respective bug report. The fix is to ask xcrun to report an SDK path which contains the version number in the SDK path (/path/to/MacOSX10.14.sdk vs just /path/to/MacOSX.sdk). Change-Id: I3f02510953e2f54032c19a48cb8a7162814bf9e7 Fixes: PYSIDE-1066 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simo Fält <simo.falt@qt.io>
-rw-r--r--build_scripts/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py
index 4d9f95b14..05e9b0f72 100644
--- a/build_scripts/main.py
+++ b/build_scripts/main.py
@@ -1056,7 +1056,7 @@ class PysideBuild(_build):
OPTION_MACOS_SYSROOT))
else:
latest_sdk_path = run_process_output(['xcrun',
- '--show-sdk-path'])
+ '--sdk', 'macosx', '--show-sdk-path'])
if latest_sdk_path:
latest_sdk_path = latest_sdk_path[0]
cmake_cmd.append("-DCMAKE_OSX_SYSROOT={}".format(