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

Unified Diff: icu.gyp

Issue 20043007: Only depend on libgabi++ for the target toolset. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/icu46/
Patch Set: Created 7 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: icu.gyp
===================================================================
--- icu.gyp (revision 213353)
+++ icu.gyp (working copy)
@@ -342,16 +342,20 @@
],
}],
['OS == "android" and use_system_stlport == 1', {
- # ICU requires RTTI, which is not present in the system's stlport,
- # so we have to include gabi++.
- 'include_dirs': [
- '<(android_src)/abi/cpp/include',
+ 'target_conditions': [
+ ['_toolset == "target"', {
+ # ICU requires RTTI, which is not present in the system's
+ # stlport, so we have to include gabi++.
+ 'include_dirs': [
+ '<(android_src)/abi/cpp/include',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '-lgabi++',
+ ],
+ },
+ }],
],
- 'link_settings': {
- 'libraries': [
- '-lgabi++',
- ],
- },
}],
],
},
@@ -566,16 +570,20 @@
},
}],
['OS == "android" and use_system_stlport == 1', {
- # ICU requires RTTI, which is not present in the system's stlport,
- # so we have to include gabi++.
- 'include_dirs': [
- '<(android_src)/abi/cpp/include',
+ 'target_conditions': [
+ ['_toolset == "target"', {
+ # ICU requires RTTI, which is not present in the system's
+ # stlport, so we have to include gabi++.
+ 'include_dirs': [
+ '<(android_src)/abi/cpp/include',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '-lgabi++',
+ ],
+ },
+ }],
],
- 'link_settings': {
- 'libraries': [
- '-lgabi++',
- ],
- },
}],
['clang==1', {
'xcode_settings': {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698