summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2019-03-01 17:28:07 +0100
committerMichael BrĂ¼ning <michael.bruning@qt.io>2019-03-01 17:11:27 +0000
commit9e299978cfb40e01f2871b71129a02f4b5b7404d (patch)
tree124ff3d01747ddf897c27326ece0610b5cf8a27f
parent9362c57ecc54bfb7e007d5f4a6ec7948b59152d4 (diff)
Pass the path to the macOS SDK used by Qt to the gn build script
Uses the value in QMAKE_MAC_SDK_PATH that Qt also uses as an isysroot parameter. Updates Chromium: 3fe203d43c Soften check for single thread only if layer1 or layer2 sandbox 0aae24c287 Add isysroot parameter for macOS to build gn with the right toolchain Change-Id: I0315a054e066ec5743235347d7e96ac8b2c05c3b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
m---------src/3rdparty0
-rw-r--r--src/buildtools/gn.pro3
2 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 29a45e8b7f5ddd792eb1e8a0332f68a68b08c2c
+Subproject 0aae24c2876d19946ce0d28adc38c3dbed2c654
diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
index 8151ca8e..30ada935 100644
--- a/src/buildtools/gn.pro
+++ b/src/buildtools/gn.pro
@@ -21,6 +21,9 @@ build_pass|!debug_and_release {
gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path \
--cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \
--ld \"$$which($$QMAKE_LINK)\"
+ macos {
+ gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\"
+ }
message($$gn_configure)
!system("$$pythonPathForSystem() $$gn_configure") {
error("GN generation error!")