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

Unified Diff: test/toolsets/toolsets.gyp

Issue 13992005: Fix rpath for components when cross-compiling. (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master
Patch Set: linux-only Created 7 years, 8 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 | « test/toolsets/main.cc ('k') | test/toolsets/toolsets_shared.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/toolsets/toolsets.gyp
diff --git a/test/toolsets/toolsets.gyp b/test/toolsets/toolsets.gyp
index 6afa7ecec3debeb49af257995c0d479c999c4a49..3bc3a784ea8881c05b2fc26f474341d4a70c55db 100644
--- a/test/toolsets/toolsets.gyp
+++ b/test/toolsets/toolsets.gyp
@@ -21,7 +21,7 @@
'target_name': 'host-main',
'type': 'executable',
'toolsets': ['host'],
- 'dependencies': ['toolsets'],
+ 'dependencies': ['toolsets', 'toolsets_shared'],
'sources': [
'main.cc',
],
@@ -29,7 +29,7 @@
{
'target_name': 'target-main',
'type': 'executable',
- 'dependencies': ['toolsets'],
+ 'dependencies': ['toolsets', 'toolsets_shared'],
'sources': [
'main.cc',
],
@@ -45,5 +45,18 @@
],
'cflags': [ '-fPIC' ],
},
+ {
+ 'target_name': 'toolsets_shared',
+ 'type': 'shared_library',
+ 'toolsets': ['target', 'host'],
+ 'target_conditions': [
+ # Ensure target and host have different shared_library names
+ ['_toolset=="host"', {'product_extension': 'host'}],
+ ],
+ 'sources': [
+ 'toolsets_shared.cc',
+ ],
+ 'cflags': [ '-fPIC' ],
+ },
],
}
« no previous file with comments | « test/toolsets/main.cc ('k') | test/toolsets/toolsets_shared.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698