diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-15 15:25:14 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-15 15:25:48 +0100 |
| commit | 3492ad65236209e741ca3641789efeaa22a6b8a4 (patch) | |
| tree | 2db061bafcebcac423ca7deeb152435c44944419 /modules/fdlibm/src/moz.build | |
| parent | 2057abd196545ddf8c85ab83e7d220367af8b276 (diff) | |
| parent | 59f4de4c45e126f5f20633808ce28548d5879b16 (diff) | |
| download | UXP-3492ad65236209e741ca3641789efeaa22a6b8a4.tar UXP-3492ad65236209e741ca3641789efeaa22a6b8a4.tar.gz UXP-3492ad65236209e741ca3641789efeaa22a6b8a4.tar.lz UXP-3492ad65236209e741ca3641789efeaa22a6b8a4.tar.xz UXP-3492ad65236209e741ca3641789efeaa22a6b8a4.zip | |
Merge branch 'fdlibm-work'
This resolves #1291
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', |