diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-11-15 17:37:54 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-11-15 17:37:54 -0500 |
| commit | 556349010e01d0a3b7896f858d503781ea837b46 (patch) | |
| tree | f003183732dc3cda4ad880407880da282ca4b0c5 /modules/fdlibm/src/moz.build | |
| parent | f3d462c6049bd2f35571c2a0e2a7c4df4f3ca81c (diff) | |
| parent | 3492ad65236209e741ca3641789efeaa22a6b8a4 (diff) | |
| download | UXP-556349010e01d0a3b7896f858d503781ea837b46.tar UXP-556349010e01d0a3b7896f858d503781ea837b46.tar.gz UXP-556349010e01d0a3b7896f858d503781ea837b46.tar.lz UXP-556349010e01d0a3b7896f858d503781ea837b46.tar.xz UXP-556349010e01d0a3b7896f858d503781ea837b46.zip | |
Merge branch 'master' into mailnews-work
Diffstat (limited to 'modules/fdlibm/src/moz.build')
| -rw-r--r-- | modules/fdlibm/src/moz.build | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/modules/fdlibm/src/moz.build b/modules/fdlibm/src/moz.build index b197881ac..be5bf3d9b 100644 --- a/modules/fdlibm/src/moz.build +++ b/modules/fdlibm/src/moz.build @@ -10,26 +10,35 @@ EXPORTS += [ FINAL_LIBRARY = 'js' -if CONFIG['GNU_CXX']: +if CONFIG['CC_TYPE'] in ('clang', 'gcc'): CXXFLAGS += [ '-Wno-parentheses', '-Wno-sign-compare', ] -if CONFIG['CLANG_CXX']: +if CONFIG['CC_TYPE'] == 'clang': CXXFLAGS += [ '-Wno-dangling-else', ] -if CONFIG['_MSC_VER']: +if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'): CXXFLAGS += [ - '-wd4018', # signed/unsigned mismatch '-wd4146', # unary minus operator applied to unsigned type '-wd4305', # truncation from 'double' to 'const float' '-wd4723', # potential divide by 0 '-wd4756', # overflow in constant arithmetic ] +if CONFIG['CC_TYPE'] == 'msvc': + CXXFLAGS += [ + '-wd4018', # signed/unsigned mismatch + ] + +if CONFIG['CC_TYPE'] == 'clang-cl': + CXXFLAGS += [ + '-Wno-sign-compare', # signed/unsigned mismatch + ] + SOURCES += [ 'e_acos.cpp', 'e_acosh.cpp', @@ -44,7 +53,6 @@ SOURCES += [ 'e_log2.cpp', 'e_pow.cpp', 'e_sinh.cpp', - 'e_sqrt.cpp', 'k_exp.cpp', 's_asinh.cpp', 's_atan.cpp', |