mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

SERVER-17566: Remove PCRE defines from SConstruct

Browse Source
This commit is contained in:
Mark Benvenuto 2015-04-03 15:26:11 -04:00
parent cb65a822aa
commit 8bb91b9798
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SConstruct
View File

@ -596,7 +596,6 @@ envDict = dict(BUILD_ROOT=buildDir,
# TODO: Move unittests.txt to $BUILD_DIR, but that requires
# changes to MCI.
UNITTEST_LIST='$BUILD_ROOT/unittests.txt',
PCRE_VERSION='8.36',
CONFIGUREDIR=sconsDataDir.Dir('sconf_temp'),
CONFIGURELOG=sconsDataDir.File('config.log'),
INSTALL_DIR=installDir,

7
src/third_party/SConscript vendored
View File

@ -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(