diff options
| author | J. Rassi <rassi@10gen.com> | 2016-05-17 12:11:27 -0400 |
|---|---|---|
| committer | J. Rassi <rassi@10gen.com> | 2016-05-17 12:20:53 -0400 |
| commit | 7172fad82cc4858946978c67206ab867f9bb1708 (patch) | |
| tree | b0355a0ed8c57476999bba1ac48b1ed6679b2f98 /src/third_party | |
| parent | 9e57365ae31417ea8334f1444444486c34d78f66 (diff) | |
| download | mongo-7172fad82cc4858946978c67206ab867f9bb1708.tar.gz | |
SERVER-22371 Allow db/query/query_common to link against ICU
Also completes implementation of --use-system-icu scons flag, and
removes --icu scons flag.
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/SConscript | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript index d965c7ab90c..5b5421d4616 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -2,7 +2,6 @@ Import("env use_system_version_of_library usemozjs get_option") Import("wiredtiger") -Import("icuEnabled") boostSuffix = "-1.60.0" snappySuffix = '-1.1.3' @@ -81,7 +80,7 @@ if not use_system_version_of_library('intel_decimal128'): thirdPartyIncludePathList.append( ('intel_decimal128', '#/src/third_party/IntelRDFPMathLib20U1/LIBRARY')) -if icuEnabled and not use_system_version_of_library('icu'): +if not use_system_version_of_library('icu'): thirdPartyIncludePathList.append( ('icu', '#/src/third_party/icu4c' + icuSuffix + '/source/common')) thirdPartyIncludePathList.append( @@ -366,21 +365,24 @@ intelDecimal128Env.Library( 'shim_intel_decimal128.cpp' ]) -if icuEnabled: - if use_system_version_of_library('icu'): - # TODO - icuEnv = env.Clone() - else: - icuEnv = env.Clone() - icuEnv.InjectThirdPartyIncludePaths(libraries=['icu']) - icuEnv.SConscript('icu4c' + icuSuffix + '/source/SConscript', exports={ 'env' : icuEnv }) - icuEnv = icuEnv.Clone( - LIBDEPS=[ - 'icu4c' + icuSuffix + '/source/icu_i18n', - ]) - - icuEnv.Library( - target='shim_icu', - source=[ - 'shim_icu.cpp', +if use_system_version_of_library("icu"): + icuEnv = env.Clone( + SYSLIBDEPS=[ + env['LIBDEPS_ICUDATA_SYSLIBDEP'], + env['LIBDEPS_ICUI18N_SYSLIBDEP'], + env['LIBDEPS_ICUUC_SYSLIBDEP'], ]) +else: + icuEnv = env.Clone() + icuEnv.InjectThirdPartyIncludePaths(libraries=['icu']) + icuEnv.SConscript('icu4c' + icuSuffix + '/source/SConscript', exports={ 'env' : icuEnv }) + icuEnv = icuEnv.Clone( + LIBDEPS=[ + 'icu4c' + icuSuffix + '/source/icu_i18n', + ]) + +icuEnv.Library( + target='shim_icu', + source=[ + 'shim_icu.cpp', + ]) |