diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-03-05 10:33:01 -0500 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-03-05 16:15:28 -0500 |
| commit | 22251f7783f3fcef07f6745da19d3e1a4f792391 (patch) | |
| tree | 3a638f3dc7a9b2f3fbd3deecab9604052074fd51 | |
| parent | 7805c5042c81d2b8aec94a6c8b90fd912e4017fa (diff) | |
| download | mongo-22251f7783f3fcef07f6745da19d3e1a4f792391.tar.gz | |
SERVER-17252: 8.36 SCons Integration - 2.6 compatibility
(cherry picked from commit 62c7c349095713d14e6035f356981398a16c55a6)
| -rw-r--r-- | src/third_party/pcre-8.36/SConscript | 6 | ||||
| -rw-r--r-- | src/third_party/pcre-8.36/build_windows/config.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/third_party/pcre-8.36/SConscript b/src/third_party/pcre-8.36/SConscript index a71a18d62ec..ce668ff1593 100644 --- a/src/third_party/pcre-8.36/SConscript +++ b/src/third_party/pcre-8.36/SConscript @@ -29,11 +29,11 @@ for to_remove in ['-Werror', '-Wall', '-W']: # -DPCRE_SUPPORT_UTF:BOOL="1" # if windows: - env.Append(CPPPATH=["build_windows"]) + env.Prepend(CPPPATH=["build_windows"]) elif solaris: - env.Append(CPPPATH=["build_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.36/build_windows/config.h b/src/third_party/pcre-8.36/build_windows/config.h index ae1d54bdabd..f2c886750e2 100644 --- a/src/third_party/pcre-8.36/build_windows/config.h +++ b/src/third_party/pcre-8.36/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 |