From a67c91a9d38e9054914c09b7bcd5c290e18645ec Mon Sep 17 00:00:00 2001
From: earthdok <earthdok@chromium.org>
Date: Thu, 12 Mar 2015 09:10:09 -0700
Subject: 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}
---
 third_party/instrumented_libraries/instrumented_libraries.gyp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'third_party/instrumented_libraries/instrumented_libraries.gyp')

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',
             ],
           }],
-- 
cgit v1.1