diff options
| author | Andrew Morrow <acm@mongodb.com> | 2016-06-15 10:36:00 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2016-06-15 15:33:49 -0400 |
| commit | ae388b954d20caa224b136d7aaf18241abc6b2b5 (patch) | |
| tree | 35bea337a60396ee63c9893b5fc5a77fcb29305e /src/third_party | |
| parent | 23f0bf30a707dabff02e63d854843b102bd1904d (diff) | |
| download | mongo-ae388b954d20caa224b136d7aaf18241abc6b2b5.tar.gz | |
SERVER-24588 Don't abandon SCons Configure object in WT SConscript
Diffstat (limited to 'src/third_party')
| -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 1e52c00221e..5fddaf582e5 100644 --- a/src/third_party/wiredtiger/SConscript +++ b/src/third_party/wiredtiger/SConscript @@ -33,18 +33,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"]) |