diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-04-03 15:26:11 -0400 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-04-10 09:55:37 -0400 |
| commit | 8bb91b9798a2799a8a5d9107a8457ca1aa08bd7a (patch) | |
| tree | e1eeb67258072d1a62700477a7474dae9499e7a9 /src/third_party | |
| parent | cb65a822aa0d620afb36ea8d29104c7dc2644d2f (diff) | |
| download | mongo-8bb91b9798a2799a8a5d9107a8457ca1aa08bd7a.tar.gz | |
SERVER-17566: Remove PCRE defines from SConstruct
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/SConscript | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript index 44381fec9f1..5522cb66652 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -5,6 +5,7 @@ Import("wiredtiger") snappySuffix = '-1.1.2' zlibSuffix = '-1.2.8' +pcreSuffix = "-8.36" thirdPartyIncludePathList = [ ('s2', '#/src/third_party/s2'), @@ -17,7 +18,7 @@ if not use_system_version_of_library('tcmalloc'): if not use_system_version_of_library('pcre'): thirdPartyIncludePathList.append( - ('pcre', '#/src/third_party/pcre-${PCRE_VERSION}')) + ('pcre', '#/src/third_party/pcre' + pcreSuffix)) if not use_system_version_of_library('boost'): thirdPartyIncludePathList.append( @@ -80,10 +81,10 @@ if use_system_version_of_library("pcre"): else: pcreEnv = env.Clone() pcreEnv.InjectThirdPartyIncludePaths(libraries=['pcre']) - pcreEnv.SConscript('pcre-${PCRE_VERSION}/SConscript', exports={ 'env' : pcreEnv }) + pcreEnv.SConscript('pcre' + pcreSuffix + '/SConscript', exports={ 'env' : pcreEnv }) pcreEnv = pcreEnv.Clone( LIBDEPS=[ - 'pcre-${PCRE_VERSION}/pcrecpp', + 'pcre' + pcreSuffix + '/pcrecpp', ]) pcreEnv.Library( |