summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Anderson <thomasanderson@chromium.org>2019-03-13 15:11:03 -0700
committerTom Anderson <thomasanderson@chromium.org>2019-03-13 15:11:03 -0700
commit076332ea7c414313ab9d6d5b56396641051df5ea (patch)
tree9c50825b61f0cc8e1eb006a32190dc38742c4782
parentbf3f26a45cfe97f7d03b32f42e0359386753f7af (diff)
downloadnasm-076332ea7c414313ab9d6d5b56396641051df5ea.tar.gz
Fix condition for using no_default_deps=true
The last change broke sanitizer builds. This is a more targeted fix. More context here: https://chromium-review.googlesource.com/c/chromium/src/+/1521275 BUG=801780 R=davidben Change-Id: Ice2a147d463170d5c0f414ab3465c5caa8b0d247
-rw-r--r--BUILD.gn8
1 files changed, 6 insertions, 2 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 95d707b5..9bdcc4e4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -34,6 +34,12 @@ if (is_debug) {
# of highbd_sad4d_sse2.asm on Windows this saved about 15 s.
configs_to_delete += [ "//build/config/win:default_crt" ]
configs_to_add += [ "//build/config/win:release_crt" ]
+
+ # Without no_default_deps, an implicit dependency on libc++ is added.
+ # libc++ may have been built referencing the debug CRT, but since we're
+ # explicitly using the release CRT, this would result in undefined symbol
+ # errors when linking, so we need to remove the implicit libc++ dependency.
+ no_default_deps = true
}
}
@@ -99,8 +105,6 @@ if (current_toolchain == host_toolchain) {
configs += configs_to_add
configs += [ ":nasm_config" ]
- no_default_deps = true
-
deps = [
# Default manifest on Windows (a no-op elsewhere).
"//build/win:default_exe_manifest",