diff options
Diffstat (limited to 'src/third_party/SConscript')
-rw-r--r-- | src/third_party/SConscript | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript index c86ebb12350..87b0774c3d6 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -47,20 +47,12 @@ def injectMozJS(thisEnv): if thisEnv.TargetOSIs('windows'): thisEnv.Append( - CCFLAGS=[ - '/FI', 'js-config.h', - '/FI', 'js/RequiredDefines.h', - ], CPPDEFINES=[ '_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING', ] ) else: thisEnv.Append( - CCFLAGS=[ - '-include', 'js-config.h', - '-include', 'js/RequiredDefines.h', - ], CXXFLAGS=[ '-Wno-non-virtual-dtor', '-Wno-invalid-offsetof', @@ -137,6 +129,10 @@ if True: '#/src/third_party/mozjs' + mozjsSuffix + '/mongo_sources', '#/src/third_party/mozjs' + mozjsSuffix + '/platform/' + env["TARGET_ARCH"] + "/" + env["TARGET_OS"] + "/include", ], + 'FORCEINCLUDES' : [ + 'js-config.h', + 'js/RequiredDefines.h', + ], } if "tom" in env["MONGO_CRYPTO"]: |