summaryrefslogtreecommitdiffstats
path: root/third_party/instrumented_libraries/instrumented_libraries.gyp
diff options
context:
space:
mode:
authorearthdok <earthdok@chromium.org>2015-03-12 09:10:09 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-12 16:11:59 +0000
commita67c91a9d38e9054914c09b7bcd5c290e18645ec (patch)
tree9ee68151408b380aeca6068db94ade41ed7fc245 /third_party/instrumented_libraries/instrumented_libraries.gyp
parent2117b1466ac5e9c26e04ed5b210777ca111dc2f0 (diff)
downloadchromium_src-a67c91a9d38e9054914c09b7bcd5c290e18645ec.zip
chromium_src-a67c91a9d38e9054914c09b7bcd5c290e18645ec.tar.gz
chromium_src-a67c91a9d38e9054914c09b7bcd5c290e18645ec.tar.bz2
Instrumented libraries: the much-needed build script rewrite.
Cleaner, no longer relying on pwd, and with 100% more OOP. BUG=none R=glider@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/1003593002 Cr-Commit-Position: refs/heads/master@{#320293}
Diffstat (limited to 'third_party/instrumented_libraries/instrumented_libraries.gyp')
-rw-r--r--third_party/instrumented_libraries/instrumented_libraries.gyp3
1 files changed, 2 insertions, 1 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp
index 105e9b8..0153c1a 100644
--- a/third_party/instrumented_libraries/instrumented_libraries.gyp
+++ b/third_party/instrumented_libraries/instrumented_libraries.gyp
@@ -8,6 +8,7 @@
'instrumented_libraries_jobs%': 1,
},
+ 'libdir': 'lib',
'ubuntu_release': '<!(lsb_release -cs)',
'conditions': [
@@ -174,7 +175,7 @@
['_toolset=="target"', {
'ldflags': [
# Add RPATH to result binary to make it linking instrumented libraries ($ORIGIN means relative RPATH)
- '-Wl,-R,\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/lib/',
+ '-Wl,-R,\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/<(_libdir)/',
'-Wl,-z,origin',
],
}],