diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 15:31:09 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-04 10:16:55 +0200 |
commit | 21b03ca176dc28e5651121f24094ada8a246cf9d (patch) | |
tree | 7a52b5c5297b601e2d2c3ff05114efc39ac4b673 /chromium/third_party/libyuv | |
parent | f115db6230aec4794d91ac6966a7417f86dd82a7 (diff) | |
download | qtwebengine-chromium-21b03ca176dc28e5651121f24094ada8a246cf9d.tar.gz |
Do not force the use of Google's custom clang binaries
Change-Id: If646130fb9327d8b82aa9d8c25d7639fc89d5bbf
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/libyuv')
-rw-r--r-- | chromium/third_party/libyuv/BUILD.gn | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/third_party/libyuv/BUILD.gn b/chromium/third_party/libyuv/BUILD.gn index e1c7c1da4db..55b57ffcad5 100644 --- a/chromium/third_party/libyuv/BUILD.gn +++ b/chromium/third_party/libyuv/BUILD.gn @@ -6,6 +6,7 @@ # in the file PATENTS. All contributing project authors may # be found in the AUTHORS file in the root of the source tree. +import("//build/config/features.gni") import("//testing/test.gni") import("libyuv.gni") @@ -50,7 +51,7 @@ group("libyuv") { all_dependent_configs = [ ":libyuv_config" ] deps = [] - if (is_win && target_cpu == "x64") { + if (is_win && target_cpu == "x64" && !use_qt) { # Compile with clang in order to get inline assembly public_deps = [ ":libyuv_internal(//build/toolchain/win:win_clang_x64)" ] } else { |