diff options
| author | Jason Rassi <rassi@10gen.com> | 2016-05-13 16:31:02 -0400 |
|---|---|---|
| committer | Jason Rassi <rassi@10gen.com> | 2016-05-13 16:36:35 -0400 |
| commit | efb54abcd4ed42861fbe8809a0dfca8683e9cdd5 (patch) | |
| tree | 913496308f4d6c0a840c6fb033028e04efdd0829 | |
| parent | f59eac414ed7e177a8514119c43794941d6b3c7b (diff) | |
| download | mongo-r3.3.6.tar.gz | |
SERVER-22371 Minor cleanup of icu4c-57.1/source/SConscriptr3.3.6
| -rw-r--r-- | src/third_party/icu4c-57.1/source/SConscript | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/third_party/icu4c-57.1/source/SConscript b/src/third_party/icu4c-57.1/source/SConscript index d87000ac3c4..e65f19eca74 100644 --- a/src/third_party/icu4c-57.1/source/SConscript +++ b/src/third_party/icu4c-57.1/source/SConscript @@ -8,7 +8,6 @@ env.Append( CPPDEFINES=[ 'UCONFIG_ONLY_COLLATION=1', 'U_CHARSET_IS_UTF8=1', - 'U_I18N_IMPLEMENTATION=1', 'U_STATIC_IMPLEMENTATION=1', ], ) @@ -22,7 +21,9 @@ def removeIfPresent(lst, item): for to_remove in ['-Werror', '-Wall', '-W']: removeIfPresent(env['CCFLAGS'], to_remove) -env.Library( +i18nEnv = env.Clone() +i18nEnv.Append(CPPDEFINES=['U_I18N_IMPLEMENTATION=1']) +i18nEnv.Library( target='icu_i18n', source=[ 'i18n/affixpatternparser.cpp', @@ -230,11 +231,7 @@ env.Library( ) commonEnv = env.Clone() - -# TODO possibly remove "-Iicu/blah/source" flag. -# TODO figure out why "-Iicu/blah/source/common" is being added twice. commonEnv.Append(CPPDEFINES=['U_COMMON_IMPLEMENTATION=1']) - commonEnv.Library( target='icu_common', source=[ |