diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-01-31 17:21:13 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-29 12:47:37 +0200 |
| commit | 83f9daf871b44af39e67ef7f698bed7477907605 (patch) | |
| tree | 12b4e166b1bf7a45adf18b75b085ed22f76e946e | |
| parent | 9465bc05fdfaee02344c0ae84ebb8e6bb99790ed (diff) | |
| download | qtwebengine-chromium-83f9daf871b44af39e67ef7f698bed7477907605.tar.gz | |
Remove linking with libatomic
Rhel machines on ci do not have it.
Change-Id: I4cbb6d9d0826a23f8065a9eebba7ba27856e44d4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -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" ] } } |