diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2018-02-26 13:06:14 -0500 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2018-02-26 13:06:14 -0500 |
| commit | e9ae96e9c81e6602c90da55a5681fe9ec74b1cb4 (patch) | |
| tree | bca03220e80d38cbb180336471a05d8f7ff7fd4b /src | |
| parent | fc8bf3751bef83ebe2b98f1e9496be3e8209b294 (diff) | |
| download | mongo-e9ae96e9c81e6602c90da55a5681fe9ec74b1cb4.tar.gz | |
SERVER-33451 Change wiredtiger_ext.h include rules
Diffstat (limited to 'src')
| -rw-r--r-- | src/third_party/SConscript | 4 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/SConscript | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript index dc1d682d5a9..1221ef9b1b1 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -76,13 +76,9 @@ if not use_system_version_of_library('stemmer'): # Note that the wiredtiger.h header is generated, so # we want to look for it in the build directory not # the source directory. -# The wiredtiger_ext.h is a static file in the source tree -# In the system installs, wiredtiger.h and wiredtiger_ext.h are in the same directory if wiredtiger and not use_system_version_of_library('wiredtiger'): thirdPartyIncludePathList.append( ('wiredtiger', '$BUILD_DIR/third_party/wiredtiger')) - thirdPartyIncludePathList.append( - ('wiredtiger_ext', '#/src/third_party/wiredtiger/src/include')) if not use_system_version_of_library('yaml'): thirdPartyIncludePathList.append( diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript index a0076ccc936..1fa77a856dc 100644 --- a/src/third_party/wiredtiger/SConscript +++ b/src/third_party/wiredtiger/SConscript @@ -126,7 +126,10 @@ env.Substfile( ], SUBST_DICT=replacements) +env.Command('wiredtiger_ext.h', 'src/include/wiredtiger_ext.h', Copy("$TARGET", "$SOURCE")) + env.Alias('generated-sources', "wiredtiger.h") +env.Alias('generated-sources', "wiredtiger_ext.h") # # WiredTiger library |