summaryrefslogtreecommitdiff
path: root/src/third_party/icu4c-57.1
diff options
context:
space:
mode:
authorJ. Rassi <rassi@10gen.com>2016-05-18 17:54:51 -0400
committerJ. Rassi <rassi@10gen.com>2016-05-20 10:23:26 -0400
commit770e967c7f9995b71af5ec9b45204d41b511f1ac (patch)
tree131f911f98705b2957eb7b08961071990dc0eb29 /src/third_party/icu4c-57.1
parent17fe3ba0b0e2300b87ce8987551e5eb7fbb9ef3a (diff)
downloadmongo-770e967c7f9995b71af5ec9b45204d41b511f1ac.tar.gz
SERVER-24195 Make ICU defines consistent btwn. ICU and client sources
Diffstat (limited to 'src/third_party/icu4c-57.1')
-rw-r--r--src/third_party/icu4c-57.1/source/SConscript5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/third_party/icu4c-57.1/source/SConscript b/src/third_party/icu4c-57.1/source/SConscript
index de0be5acf60..7923fa47a67 100644
--- a/src/third_party/icu4c-57.1/source/SConscript
+++ b/src/third_party/icu4c-57.1/source/SConscript
@@ -4,11 +4,16 @@ Import('env')
env = env.Clone()
+# The below list of defines are used to configure ICU. They must be duplicated exactly in every
+# library that injects the third-party ICU headers. If this list is changed here, it must be changed
+# in other such libraries as well.
env.Append(
CPPDEFINES=[
('UCONFIG_ONLY_COLLATION', 1),
('U_CHARSET_IS_UTF8', 1),
+ ('U_DISABLE_RENAMING', 1),
('U_STATIC_IMPLEMENTATION', 1),
+ ('U_USING_ICU_NAMESPACE', 0),
],
)