summaryrefslogtreecommitdiff
path: root/chromium
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-11 15:31:09 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-06-08 14:19:40 +0000
commitdc9cb2a1b3d3abfc8b8309ab133d474647838137 (patch)
treef5660afb4c01fde8a8d4c5f40ac119ada0c011c0 /chromium
parentb7791662a0612771a44ea4935369d759c15f85c2 (diff)
downloadqtwebengine-chromium-dc9cb2a1b3d3abfc8b8309ab133d474647838137.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>
Diffstat (limited to 'chromium')
-rw-r--r--chromium/third_party/libyuv/BUILD.gn3
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/third_party/libyuv/BUILD.gn b/chromium/third_party/libyuv/BUILD.gn
index 4f56cdc248a..1c50134a160 100644
--- a/chromium/third_party/libyuv/BUILD.gn
+++ b/chromium/third_party/libyuv/BUILD.gn
@@ -7,6 +7,7 @@
# be found in the AUTHORS file in the root of the source tree.
import("libyuv.gni")
+import("//build/config/features.gni")
import("//testing/test.gni")
config("libyuv_config") {
@@ -39,7 +40,7 @@ group("default") {
group("libyuv") {
public_configs = [ ":libyuv_config" ]
- if (is_win && target_cpu == "x64") {
+ if (is_win && target_cpu == "x64" && !use_qt) {
public_deps = [
":libyuv_internal(//build/toolchain/win:clang_x64)",
]