Index: build/config/compiler/BUILD.gn |
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
index 3366419dca11caacd79d10b9257a59fa8526bb02..dd7e98b3dc1715df276ce6ecaf63c62203f82422 100644 |
--- a/build/config/compiler/BUILD.gn |
+++ b/build/config/compiler/BUILD.gn |
@@ -543,10 +543,12 @@ config("runtime_library") { |
defines += [ "__GNU_SOURCE=1" ] # Necessary for clone(). |
- ldflags += [ |
- "-Wl,--warn-shared-textrel", |
- "-nostdlib", |
- ] |
+ # TODO(jdduke) Re-enable on mips after resolving linking |
+ # issues with libc++ (crbug.com/456380). |
+ if (cpu_arch != "mipsel" && cpu_arch != "mips64el") { |
+ ldflags += [ "-Wl,--warn-shared-textrel" ] |
+ } |
+ ldflags += [ "-nostdlib" ] |
android_libcpp_root = "$android_ndk_root/sources/cxx-stl/llvm-libc++" |
@@ -917,10 +919,15 @@ if (is_win) { |
if (!using_sanitizer) { |
common_optimize_on_cflags += [ "-fomit-frame-pointer" ] |
} |
- common_optimize_on_ldflags += [ |
- # Warn in case of text relocations. |
- "-Wl,--warn-shared-textrel", |
- ] |
+ |
+ # TODO(jdduke) Re-enable on mips after resolving linking |
+ # issues with libc++ (crbug.com/456380). |
+ if (cpu_arch != "mipsel" && cpu_arch != "mips64el") { |
+ common_optimize_on_ldflags += [ |
+ # Warn in case of text relocations. |
+ "-Wl,--warn-shared-textrel", |
+ ] |
+ } |
} |
if (is_mac) { |