Skip to content
Snippets Groups Projects
Commit 51fac8a8 authored by jshin@chromium.org's avatar jshin@chromium.org
Browse files

Disable U_ENABLE_DYLOAD in icu*gyp

dl_open and friends are only used by ICU plugins that we don't use.
Nacl-related targets (with newlib) fail because dlfcn.h is missing.

Setting U_ENABLE_DYLOAD to 0, we don't have to worry about dlfcn.h any more (it's not included)

BUG=132145
TEST=After running build/gyp_chromium, build 'base_i18n_nacl' target. It should succeed without complaining about dlfcn.h.
R=sergeyu@chromium.org

Review URL: https://codereview.chromium.org/263763002

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/icu52@267357 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
parent c9eddd37
No related branches found
No related tags found
No related merge requests found
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
# Tell ICU to not insert |using namespace icu;| into its headers, # Tell ICU to not insert |using namespace icu;| into its headers,
# so that chrome's source explicitly has to use |icu::|. # so that chrome's source explicitly has to use |icu::|.
'U_USING_ICU_NAMESPACE=0', 'U_USING_ICU_NAMESPACE=0',
# We don't use ICU plugins and dyload is only necessary for them.
# NaCl-related builds also fail looking for dlfcn.h when it's enabled.
'U_ENABLE_DYLOAD=0',
], ],
}, },
'defines': [ 'defines': [
......
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
# Tell ICU to not insert |using namespace icu;| into its headers, # Tell ICU to not insert |using namespace icu;| into its headers,
# so that chrome's source explicitly has to use |icu::|. # so that chrome's source explicitly has to use |icu::|.
'U_USING_ICU_NAMESPACE=0', 'U_USING_ICU_NAMESPACE=0',
# We don't use ICU plugins and dyload is only necessary for them.
# NaCl-related builds also fail looking for dlfcn.h when it's enabled.
'U_ENABLE_DYLOAD=0',
], ],
}, },
'defines': [ 'defines': [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment