diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2013-12-31 15:15:59 -0500 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2013-12-31 15:16:54 -0500 |
| commit | 7964cab85a28baaff6534a91b6b379b79e7a738a (patch) | |
| tree | e9670cdf853790c9274029e5b2036c3e07f68763 /src/third_party/s2 | |
| parent | 6486c53c2de908d90f098eb1295a07440a8cc6b0 (diff) | |
| download | mongo-7964cab85a28baaff6534a91b6b379b79e7a738a.tar.gz | |
SERVER-12166: Promote struct/class mismatch warning to error with GCC/Clang
Diffstat (limited to 'src/third_party/s2')
| -rw-r--r-- | src/third_party/s2/SConscript | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/third_party/s2/SConscript b/src/third_party/s2/SConscript index 764a5be76ce..9179fe6d272 100644 --- a/src/third_party/s2/SConscript +++ b/src/third_party/s2/SConscript @@ -1,6 +1,6 @@ # -*- mode: python -*- -Import("env windows linux darwin solaris") +Import("env windows linux darwin solaris use_clang") env = env.Clone() @@ -14,6 +14,13 @@ env.SConscript( [ env.Append(CCFLAGS=['-Isrc/third_party/s2']) env.Append(CCFLAGS=['-DDEBUG_MODE=false']) +# Clang warns about struct/class tag mismatch, but as long as this is +# not a problem on Windows, these mismatches can be ignored +# http://stackoverflow.com/questions/4866425/mixing-class-and-struct. W +# warning so it doesn't become an error. +if use_clang: + env.Append(CCFLAGS=['-Wno-mismatched-tags']) + env.StaticLibrary( "s2", [ "s1angle.cc", |