diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-04 12:34:17 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-04 12:34:25 +0100 |
| commit | c98ef56544cd54661b61529829caf6a799a1a94f (patch) | |
| tree | bbc0e45c2353ad1c8b88022e73430299be71b0a4 /build_scripts/main.py | |
| parent | 6eb583d77019ad03112c188b20063e2199486235 (diff) | |
| parent | 8dd42e79505bfb5477fafbe12056e2dd3c7f07b9 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I517592ab793c57f73a14f6933e1cbf6dab9fddad
Diffstat (limited to 'build_scripts/main.py')
| -rw-r--r-- | build_scripts/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index 4d9f95b14..5f536792a 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -705,7 +705,7 @@ class PysideBuild(_build): log.info("Creating install folder {}...".format(self.install_dir)) os.makedirs(self.install_dir) - if not (OPTION_ONLYPACKAGE + if (not OPTION_ONLYPACKAGE and not config.is_internal_shiboken_generator_build_and_part_of_top_level_all()): # Build extensions for ext in config.get_buildable_extensions(): @@ -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( |