Fix config issues and revert previous fixes for semi-colon issues
This reverts commit 41261d95a417bb3a121c162154d441433705a237.
This reverts commit 7c9accb6534d4cde050555b8091b434dc7e4d218.
Instead of trying to work around all of the potential semicolon issues
in glslang, making it conform to Chromium's style, mark the code
explicitly as non-chromium in the BUILD.gn, so chromium doesn't
attempt to enforce its style rules on glslang.
Fixes #1931
diff --git a/BUILD.gn b/BUILD.gn
index b2878af..77d596e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -159,7 +159,7 @@
}
if (is_clang) {
- cflags_cc = [
+ cflags = [
"-Wno-extra-semi",
"-Wno-ignored-qualifiers",
"-Wno-implicit-fallthrough",
@@ -168,7 +168,6 @@
"-Wno-unused-variable",
"-Wno-missing-field-initializers",
"-Wno-newline-eof",
- "-Wextra-semi",
]
}
if (is_win && !is_clang) {
@@ -182,6 +181,9 @@
"${spirv_tools_dir}:spvtools_opt",
"${spirv_tools_dir}:spvtools_val",
]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
}
source_set("glslang_default_resource_limits_sources") {
@@ -193,6 +195,9 @@
":glslang_sources",
]
public_configs = [ ":glslang_public" ]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
}
executable("glslang_validator") {
@@ -208,6 +213,9 @@
":glslang_default_resource_limits_sources",
":glslang_sources",
]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
}
executable("spirv-remap") {
@@ -218,4 +226,7 @@
deps = [
":glslang_sources",
]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
}