diff options
| -rw-r--r-- | chromium/base/BUILD.gn | 2 | ||||
| -rw-r--r-- | chromium/build/config/linux/BUILD.gn | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/base/BUILD.gn b/chromium/base/BUILD.gn index 7fb93868d6e..62f54f80999 100644 --- a/chromium/base/BUILD.gn +++ b/chromium/base/BUILD.gn @@ -1248,7 +1248,7 @@ jumbo_component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. - if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) && + if (!use_sysroot && (is_android || (is_linux && !is_chromecast && !use_qt)) && host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } diff --git a/chromium/build/config/linux/BUILD.gn b/chromium/build/config/linux/BUILD.gn index 6ca9b6a9348..bdef669a006 100644 --- a/chromium/build/config/linux/BUILD.gn +++ b/chromium/build/config/linux/BUILD.gn @@ -28,7 +28,7 @@ config("runtime_library") { } if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") && - (!use_custom_libcxx || current_cpu == "mipsel")) { + (!use_custom_libcxx || current_cpu == "mipsel") && !use_qt) { libs = [ "atomic" ] } } |