summaryrefslogtreecommitdiff
path: root/src/third_party
diff options
context:
space:
mode:
authorMathew Robinson <chasinglogic@gmail.com>2019-05-06 16:29:45 -0400
committerMathew Robinson <chasinglogic@gmail.com>2019-05-07 11:51:25 -0400
commitf0f26c1dfc377ba471e75988b09a2385dbf42609 (patch)
tree21c37739f9ef36b03f5aab994afd8bc6607fc228 /src/third_party
parent96e96c3af633f856dc0bb695c3fe0691a16459e0 (diff)
downloadmongo-f0f26c1dfc377ba471e75988b09a2385dbf42609.tar.gz
SERVER-40800 Move -Wno-invalid-offsetof to CXXFLAGS
Diffstat (limited to 'src/third_party')
-rw-r--r--src/third_party/SConscript2
-rw-r--r--src/third_party/mozjs-60/SConscript2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript
index c129f6765ec..ef5b0f99a6f 100644
--- a/src/third_party/SConscript
+++ b/src/third_party/SConscript
@@ -50,10 +50,10 @@ def injectMozJS(thisEnv):
CCFLAGS=[
'-include', 'js-config.h',
'-include', 'js/RequiredDefines.h',
- '-Wno-invalid-offsetof',
],
CXXFLAGS=[
'-Wno-non-virtual-dtor',
+ '-Wno-invalid-offsetof',
],
)
diff --git a/src/third_party/mozjs-60/SConscript b/src/third_party/mozjs-60/SConscript
index dbf79864fb5..42741bc85ed 100644
--- a/src/third_party/mozjs-60/SConscript
+++ b/src/third_party/mozjs-60/SConscript
@@ -67,10 +67,10 @@ else:
env.Append(
CCFLAGS=[
'-include', 'js-confdefs.h',
- '-Wno-invalid-offsetof',
],
CXXFLAGS=[
'-Wno-non-virtual-dtor',
+ '-Wno-invalid-offsetof',
],
)