Commit cbd36495 authored by Peng Huang's avatar Peng Huang Committed by Commit Bot

Fix build errors with enable_vulkan=true for Linux

Bug: 807632
Change-Id: I4ba225af77087aec951420e033c6e361f88f249d
Reviewed-on: https://chromium-review.googlesource.com/905222Reviewed-by: default avatarAntoine Labour <piman@chromium.org>
Commit-Queue: Peng Huang <penghuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534756}
parent 6f36eb20
...@@ -189,6 +189,9 @@ static_library("SPIRV-Tools") { ...@@ -189,6 +189,9 @@ static_library("SPIRV-Tools") {
all_dependent_configs = [ ":SPIRV-Tools_config" ] all_dependent_configs = [ ":SPIRV-Tools_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":build_version_inc", ":build_version_inc",
":core_tables_1-0", ":core_tables_1-0",
......
...@@ -20,10 +20,9 @@ config("glslang_config") { ...@@ -20,10 +20,9 @@ config("glslang_config") {
config("glslang_local_config") { config("glslang_local_config") {
if (is_clang) { if (is_clang) {
cflags = [ cflags = [
"-Wno-tautological-constant-out-of-range-compare",
"-Wno-reorder", "-Wno-reorder",
"-Wno-sign-compare", "-Wno-sign-compare",
"-Wno-unused-variable", "-Wno-tautological-constant-out-of-range-compare",
] ]
} }
} }
...@@ -35,6 +34,8 @@ static_library("OGLCompiler") { ...@@ -35,6 +34,8 @@ static_library("OGLCompiler") {
] ]
all_dependent_configs = [ ":glslang_config" ] all_dependent_configs = [ ":glslang_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ ":glslang_local_config" ] configs += [ ":glslang_local_config" ]
} }
...@@ -59,6 +60,8 @@ static_library("SPIRV") { ...@@ -59,6 +60,8 @@ static_library("SPIRV") {
] ]
all_dependent_configs = [ ":glslang_config" ] all_dependent_configs = [ ":glslang_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ ":glslang_local_config" ] configs += [ ":glslang_local_config" ]
} }
...@@ -68,6 +71,8 @@ static_library("glslang-default-resource-limits") { ...@@ -68,6 +71,8 @@ static_library("glslang-default-resource-limits") {
] ]
all_dependent_configs = [ ":glslang_config" ] all_dependent_configs = [ ":glslang_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ ":glslang_local_config" ] configs += [ ":glslang_local_config" ]
} }
...@@ -144,6 +149,8 @@ static_library("glslang") { ...@@ -144,6 +149,8 @@ static_library("glslang") {
} }
all_dependent_configs = [ ":glslang_config" ] all_dependent_configs = [ ":glslang_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ ":glslang_local_config" ] configs += [ ":glslang_local_config" ]
} }
...@@ -163,6 +170,8 @@ static_library("HLSL") { ...@@ -163,6 +170,8 @@ static_library("HLSL") {
] ]
all_dependent_configs = [ ":glslang_config" ] all_dependent_configs = [ ":glslang_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ ":glslang_local_config" ] configs += [ ":glslang_local_config" ]
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment