| Index: build/config/win/BUILD.gn
|
| diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn
|
| index a7db829cd6b1bc33b5f81917f905f40927067b5c..5e1f7fcc4d83dc25ef571b9490445f8c59c54db8 100644
|
| --- a/build/config/win/BUILD.gn
|
| +++ b/build/config/win/BUILD.gn
|
| @@ -256,7 +256,8 @@ config("common_linker_setup") {
|
| # https://msdn.microsoft.com/en-us/library/windows/desktop/mt637065.aspx
|
| # /DYNAMICBASE (ASLR) is turned off in debug builds, therefore CFG can’t be
|
| # turned on either.
|
| - if (!is_debug) {
|
| + # TODO(thakis): Turn this on with lld once supported, https://crbug.com/693709
|
| + if (!is_debug && !use_lld) {
|
| # Turn on CFG in msvc linker, regardless of compiler used.
|
| ldflags += [ "/guard:cf" ]
|
| }
|
|
|