diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-05-08 15:11:40 -0400 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-05-08 15:11:50 -0400 |
| commit | 216e01a7298b0176dc71e11af000a105c3ce7222 (patch) | |
| tree | 85d1af8ee1123436321154bc554a715f488d8b65 | |
| parent | 2cbd4ea656c5f040e38699bcd81126b6ecffec5f (diff) | |
| download | mongo-216e01a7298b0176dc71e11af000a105c3ce7222.tar.gz | |
SERVER-18312: 8.37 SCons Integration - 2.6 compatibility
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | src/third_party/pcre-8.37/SConscript | 12 | ||||
| -rw-r--r-- | src/third_party/pcre-8.37/build_windows/config.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct index ea53d76b967..1a1ed558249 100644 --- a/SConstruct +++ b/SConstruct @@ -468,7 +468,7 @@ env = Environment( BUILD_DIR=variantDir, UNITTEST_LIST='#build/unittests.txt', PYSYSPLATFORM=os.sys.platform, - PCRE_VERSION='8.36', + PCRE_VERSION='8.37', CONFIGUREDIR = '#' + scons_data_dir + '/sconf_temp', CONFIGURELOG = '#' + scons_data_dir + '/config.log' ) diff --git a/src/third_party/pcre-8.37/SConscript b/src/third_party/pcre-8.37/SConscript index e7b9a59a550..f4b13b379c4 100644 --- a/src/third_party/pcre-8.37/SConscript +++ b/src/third_party/pcre-8.37/SConscript @@ -1,6 +1,6 @@ # -*- mode: python -*- -Import("env") +Import("env windows solaris") env = env.Clone() env.Append( CPPDEFINES=[ "HAVE_CONFIG_H", ] ) @@ -28,12 +28,12 @@ for to_remove in ['-Werror', '-Wall', '-W']: # -DPCRE_MATCH_LIMIT:STRING="200000" -DPCRE_PARENS_NEST_LIMIT:STRING="250" # -DPCRE_SUPPORT_UTF:BOOL="1" # -if env.TargetOSIs('windows'): - env.Append(CPPPATH=["build_windows"]) -elif env.TargetOSIs('solaris'): - env.Append(CPPPATH=["build_solaris"]) +if windows: + env.Prepend(CPPPATH=["build_windows"]) +elif solaris: + env.Prepend(CPPPATH=["build_solaris"]) else: - env.Append(CPPPATH=["build_posix"]) + env.Prepend(CPPPATH=["build_posix"]) env.Library( "pcrecpp", [ # pcre diff --git a/src/third_party/pcre-8.37/build_windows/config.h b/src/third_party/pcre-8.37/build_windows/config.h index ae1d54bdabd..f2c886750e2 100644 --- a/src/third_party/pcre-8.37/build_windows/config.h +++ b/src/third_party/pcre-8.37/build_windows/config.h @@ -14,7 +14,7 @@ /* #undef HAVE_BCOPY */ #define HAVE_MEMMOVE 1 #define HAVE_STRERROR 1 -#define HAVE_STRTOLL 1 +/* #undef HAVE_STRTOLL */ /* #undef HAVE_STRTOQ */ #define HAVE__STRTOI64 1 |