Commit c6017909 authored by jdduke's avatar jdduke Committed by Commit bot

[Android] Temporarily disable --warn-shared-textrel for mips

Mips builds hit this warning when linking the mesa library with libc++.
Temporarily disable the warning until a permanent solution can be found.

BUG=456380

Review URL: https://codereview.chromium.org/898403003

Cr-Commit-Position: refs/heads/master@{#317709}
parent fecb18b7
......@@ -3593,7 +3593,9 @@
'-gdwarf-4',
],
'conditions' : [
['OS=="android"', {
['OS=="android" and target_arch!="mipsel" and target_arch!="mips64el"', {
# TODO(jdduke) Re-enable on mips after resolving linking
# issues with libc++ (crbug.com/456380).
'ldflags': [
# Warn in case of text relocations.
'-Wl,--warn-shared-textrel',
......@@ -3686,15 +3688,19 @@
'-fomit-frame-pointer',
]
}],
['OS=="android"', {
'variables': {
'release_optimize%': 's',
},
['OS=="android" and target_arch!="mipsel" and target_arch!="mips64el"', {
# TODO(jdduke) Re-enable on mips after resolving linking
# issues with libc++ (crbug.com/456380).
'ldflags': [
# Warn in case of text relocations.
'-Wl,--warn-shared-textrel',
],
}],
['OS=="android"', {
'variables': {
'release_optimize%': 's',
},
}],
['profiling==1', {
'cflags': [
'-fno-omit-frame-pointer',
......
......@@ -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) {
......
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