summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2018-05-31 09:09:40 +0200
committerPeter Varga <pvarga@inf.u-szeged.hu>2018-06-01 13:00:18 +0000
commitb0a174dcfc0916b26d5a49b40755181468b85cee (patch)
tree74b087e19ff4f0da8f6b511a7226b4aceec8f45a
parent4e8546e38c48f97338ab27a92b70b0b5c5d6f854 (diff)
downloadqtwebengine-chromium-b0a174dcfc0916b26d5a49b40755181468b85cee.tar.gz
FIXUP: Reintroduce ninja_use_custom_environment_files
Windows build fails due to the unused goma_disabled variable if ninja_use_custom_environment_files is disabled. Use disable_goma instead. Change-Id: Iacb316cd1f8519f23aa16f4ce7a3537e2c8d3a88 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/build/config/win/BUILD.gn8
1 files changed, 1 insertions, 7 deletions
diff --git a/chromium/build/config/win/BUILD.gn b/chromium/build/config/win/BUILD.gn
index f19b5877dcc..94ba7e6f09b 100644
--- a/chromium/build/config/win/BUILD.gn
+++ b/chromium/build/config/win/BUILD.gn
@@ -13,12 +13,6 @@ import("//build/toolchain/toolchain.gni")
assert(is_win)
-if (disable_goma) {
- goma_disabled = "true"
-} else {
- goma_disabled = "false"
-}
-
declare_args() {
# Set this to true to enable static analysis through Visual Studio's
# /analyze. This dramatically slows compiles and reports thousands of
@@ -322,7 +316,7 @@ config("sdk_link") {
current_os,
current_cpu,
"none",
- goma_disabled,
+ disable_goma,
],
"scope")
} else {