third_party/instrumented_libraries/instrumented_libraries.gyp - Issue 1003593002: Instrumented libraries: the much-needed build script rewrite.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/instrumented_libraries/instrumented_libraries.gyp

Issue 1003593002: Instrumented libraries: the much-needed build script rewrite. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address remaining comments Created 5 years, 9 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 | « third_party/instrumented_libraries/download_build_install.py ('k') | third_party/instrumented_libraries/standard_instrumented_package_target.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: 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 105e9b841e22da98897e71a40c048ed8bd609c4d..0153c1ab9f394071563e8f9ca6c0441bccc7c860 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',

}],