Commit 38a36217 authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

Remove fatal_linker_warnings_win again after https://chromium-review.googlesource.com/1602732

It was added for that bug and is now no longer needed.

Bug: 958955
Change-Id: Ib335d3946d158f566124dbf57ac5f328b14affc6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1609879
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarRoger Tawa <rogerta@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659114}
parent d7f8f234
...@@ -431,7 +431,6 @@ default_compiler_configs = [ ...@@ -431,7 +431,6 @@ default_compiler_configs = [
"//build/config/compiler:default_stack_frames", "//build/config/compiler:default_stack_frames",
"//build/config/compiler:default_symbols", "//build/config/compiler:default_symbols",
"//build/config/compiler:export_dynamic", "//build/config/compiler:export_dynamic",
"//build/config/compiler:fatal_linker_warnings_win",
"//build/config/compiler:no_exceptions", "//build/config/compiler:no_exceptions",
"//build/config/compiler:no_rtti", "//build/config/compiler:no_rtti",
"//build/config/compiler:runtime_library", "//build/config/compiler:runtime_library",
......
...@@ -1236,6 +1236,9 @@ config("default_warnings") { ...@@ -1236,6 +1236,9 @@ config("default_warnings") {
if (treat_warnings_as_errors) { if (treat_warnings_as_errors) {
cflags += [ "/WX" ] cflags += [ "/WX" ]
} }
if (fatal_linker_warnings) {
ldflags = [ "/WX" ]
}
cflags += [ cflags += [
# Warnings permanently disabled: # Warnings permanently disabled:
...@@ -1500,14 +1503,6 @@ config("default_warnings") { ...@@ -1500,14 +1503,6 @@ config("default_warnings") {
} }
} }
config("fatal_linker_warnings_win") {
# TODO(thakis): Move this back into default_warnings once
# https://crbug.com/958955 is resolved.
if (is_win && fatal_linker_warnings) {
ldflags = [ "/WX" ]
}
}
# chromium_code --------------------------------------------------------------- # chromium_code ---------------------------------------------------------------
# #
# Toggles between higher and lower warnings for code that is (or isn't) # Toggles between higher and lower warnings for code that is (or isn't)
......
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