diff options
author | Michael Brüning <michael.bruning@qt.io> | 2021-03-30 15:33:43 +0200 |
---|---|---|
committer | Michael Brüning <michael.bruning@qt.io> | 2021-03-30 13:53:28 +0000 |
commit | 8d49f9a2bf7da4b42e085cd97cc6d611ce81338a (patch) | |
tree | 45c854d9cc37813c01cf2ea1e1c4f284be45e38d | |
parent | 4a749092925888e15a0dc3cb818e0cff857c9cfa (diff) |
Fixup for: [Backport] Security bug 1062941
Do not make the build believe it is using clang on Windows.
Change-Id: I7916c361d34b4d6d12bf885329b38103709e274e
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
-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 d733e71de8d..3d5298d7041 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") @@ -49,7 +50,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 { |