Commit ae768dbf authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

attempt to remove a workaround

Bug: 623236
Change-Id: I7d914fd314685b0e874e515a48dfcd1819c895d2
Reviewed-on: https://chromium-review.googlesource.com/1067602Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#560376}
parent 259b9dd2
...@@ -381,20 +381,10 @@ config("compiler") { ...@@ -381,20 +381,10 @@ config("compiler") {
"-Wl,-z,relro", "-Wl,-z,relro",
] ]
if (!using_sanitizer) { if (!using_sanitizer) {
ldflags += [ "-Wl,-z,defs" ] ldflags += [
"-Wl,-z,defs",
# Functions interposed by the sanitizers can make ld think "-Wl,--as-needed",
# that some libraries aren't needed when they actually are, ]
# http://crbug.com/234010. As workaround, disable --as-needed.
if (!is_nacl && !is_android) {
# TODO(pcc): Fix linker bug which requires us to link pthread
# unconditionally here (crbug.com/623236).
ldflags += [
"-Wl,--no-as-needed",
"-lpthread",
]
}
ldflags += [ "-Wl,--as-needed" ]
} }
} }
......
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