diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-03-21 09:47:20 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2022-03-21 10:35:01 +0000 |
| commit | 5b69bca2acb9a7ecd69b26ad827b2e9ee4c90fdc (patch) | |
| tree | 9c472a82b138b22c82cf4f4b54835dcb87fd800f | |
| parent | 1c12bb220ad686ef0184d814d6722f904e2b5432 (diff) | |
| download | qtwebengine-chromium-5b69bca2acb9a7ecd69b26ad827b2e9ee4c90fdc.tar.gz | |
Do not override ios settings
We do setup on qt side, do not override.
Change-Id: I29145205fdd8e0cac1f782f3ab1b92b3e2dbb3b6
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | chromium/build/toolchain/mac/BUILD.gn | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/build/toolchain/mac/BUILD.gn b/chromium/build/toolchain/mac/BUILD.gn index c03a4a670ce..9429f12f680 100644 --- a/chromium/build/toolchain/mac/BUILD.gn +++ b/chromium/build/toolchain/mac/BUILD.gn @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/features.gni") import("//build/config/mac/mac_sdk.gni") import("//build/toolchain/apple/toolchain.gni") import("//build_overrides/build.gni") @@ -21,7 +22,7 @@ template("mac_toolchain") { forward_variables_from(invoker.toolchain_args, "*") current_os = "mac" - if (target_os == "ios") { + if (target_os == "ios" && !use_qt) { # Use LLD for the host part of a chrome/ios build. use_lld = true |