From 9e299978cfb40e01f2871b71129a02f4b5b7404d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Fri, 1 Mar 2019 17:28:07 +0100 Subject: 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 --- src/3rdparty | 2 +- src/buildtools/gn.pro | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/3rdparty b/src/3rdparty index 29a45e8b7..0aae24c28 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 29a45e8b7f5ddd792eb1e8a0332f68a68b08c2c6 +Subproject commit 0aae24c2876d19946ce0d28adc38c3dbed2c6549 diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro index 8151ca8ee..30ada9357 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!") -- cgit v1.2.3