diff options
| author | Andrew Morrow <acm@mongodb.com> | 2016-06-15 10:36:00 -0400 |
|---|---|---|
| committer | Ramon Fernandez <ramon@mongodb.com> | 2016-06-22 07:39:56 -0400 |
| commit | 1c34e804bfe5aff20d3e774704ce1e49196a8d45 (patch) | |
| tree | 6a3c2d68820db4b567557574e678cd4a353f923d | |
| parent | 7de0e11ea9c8a0ad2772e75d960927592532566b (diff) | |
| download | mongo-1c34e804bfe5aff20d3e774704ce1e49196a8d45.tar.gz | |
SERVER-24588 Don't abandon SCons Configure object in WT SConscript
(cherry picked from commit ae388b954d20caa224b136d7aaf18241abc6b2b5)
| -rw-r--r-- | src/third_party/wiredtiger/SConscript | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript index c21696c9756..6359568f0b2 100644 --- a/src/third_party/wiredtiger/SConscript +++ b/src/third_party/wiredtiger/SConscript @@ -23,18 +23,19 @@ env.Append(CPPDEFINES=["HAVE_VERBOSE"]) conf = Configure(env) if conf.CheckFunc("fallocate"): - env.Append(CPPDEFINES=[ - "HAVE_FALLOCATE" + conf.env.Append(CPPDEFINES=[ + "HAVE_FALLOCATE" ]) if conf.CheckFunc("sync_file_range"): - env.Append(CPPDEFINES=[ - "HAVE_SYNC_FILE_RANGE" + conf.env.Append(CPPDEFINES=[ + "HAVE_SYNC_FILE_RANGE" ]) if conf.CheckCHeader('x86intrin.h'): - env.Append(CPPDEFINES=[ - "HAVE_X86INTRIN_H" + conf.env.Append(CPPDEFINES=[ + "HAVE_X86INTRIN_H" ]) +env = conf.Finish(); if env.TargetOSIs('windows'): env.Append(CPPPATH=["build_win"]) |