Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2769)

Unified Diff: build/config/compiler/BUILD.gn

Issue 960873002: Update from https://crrev.com/318214 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/android/rules.gni ('k') | build/config/features.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/compiler/BUILD.gn
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 8cb4088b1695e821e905963147ea100eab7481dc..5cf0331c87d64bb16123d72e0993db9c448424b1 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -554,10 +554,12 @@ config("runtime_library") {
"__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" ]
# NOTE: The stlport header include paths below are specified in cflags
# rather than include_dirs because they need to come after include_dirs.
@@ -949,10 +951,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) {
« no previous file with comments | « build/config/android/rules.gni ('k') | build/config/features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698