aboutsummaryrefslogtreecommitdiff
path: root/icu.gyp
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2013-02-04 21:51:50 +0000
committertfarina@chromium.org <tfarina@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2013-02-04 21:51:50 +0000
commit9722982eec7a0cd8be785c94a831ef109a07c8a8 (patch)
tree7cb91d98923434e1af2d46c88eb8a36448e00e47 /icu.gyp
parent1aac95c366b355b6c2a1d691d7aa7b8c77cf327a (diff)
downloadicu-9722982eec7a0cd8be785c94a831ef109a07c8a8.tar.gz
No need to compare library variable against 'shared_library'.
We don't need to compare it here, because as it is defined in build/common.gypi, it's always 'static_library', so this condition is always true. Which turns out we are always defining U_HIDE_DATA_SYMBOL. Just do it unconditionally. BUG=111541 R=thakis@chromium.org Review URL: https://codereview.chromium.org/12093111 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/icu46@180531 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'icu.gyp')
-rw-r--r--icu.gyp8
1 files changed, 3 insertions, 5 deletions
diff --git a/icu.gyp b/icu.gyp
index 4682e6f..4290fe9 100644
--- a/icu.gyp
+++ b/icu.gyp
@@ -43,6 +43,9 @@
{
'target_name': 'icudata',
'type': 'static_library',
+ 'defines': [
+ 'U_HIDE_DATA_SYMBOL',
+ ],
'sources': [
# These are hand-generated, but will do for now. The linux
# version is an identical copy of the (mac) icudt46l_dat.S file,
@@ -96,11 +99,6 @@
], # target_conditions
}, # link_settings
}],
- [ 'library != "shared_library"', {
- 'defines': [
- 'U_HIDE_DATA_SYMBOL',
- ],
- }],
],
},
{