summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrucedawson <brucedawson@chromium.org>2016-03-25 17:38:36 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-26 00:41:45 +0000
commitebdb684a77d95889be31d09df5973297ca4decce (patch)
treeb49cbde32adf0dbc995709108d0fa9689b23df27
parent62d2cd3abf0d578012591e946a8a415b3092fb91 (diff)
downloadchromium_src-ebdb684a77d95889be31d09df5973297ca4decce.zip
chromium_src-ebdb684a77d95889be31d09df5973297ca4decce.tar.gz
chromium_src-ebdb684a77d95889be31d09df5973297ca4decce.tar.bz2
Disable incremental linking for gn osmesa
Due to a VS 2015 linker bug the linker sometimes crashes when incrementally linking osmesa.dll. The bug is understood by Microsoft and will be fixed but while waiting for the fix it would be nice to avoid the crash. This disables incremental linking for gn builds only. I could not get disabling for gyp builds to work so this is a partial fix. gn FTW! BUG=440500,482671 Review URL: https://codereview.chromium.org/1833263002 Cr-Commit-Position: refs/heads/master@{#383420}
-rw-r--r--third_party/mesa/BUILD.gn5
1 files changed, 5 insertions, 0 deletions
diff --git a/third_party/mesa/BUILD.gn b/third_party/mesa/BUILD.gn
index 31df76a..5108af1 100644
--- a/third_party/mesa/BUILD.gn
+++ b/third_party/mesa/BUILD.gn
@@ -713,6 +713,11 @@ loadable_module("osmesa") {
if (is_win) {
ldflags = [ "/DEF:" + rebase_path("src/src/mesa/drivers/osmesa/osmesa.def",
root_build_dir) ]
+
+ # TODO(brucedawson) : remove when crbug.com/482671 is resolved by
+ # Microsoft.
+ configs -= [ "//build/config/win:default_incremental_linking" ]
+ configs += [ "//build/config/win:no_incremental_linking" ]
}
deps = [