diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-02-12 00:06:13 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-02-12 00:06:13 +0100 |
| commit | 6f9adc9f7215a362d23e45b861017638ec67c723 (patch) | |
| tree | 81c07fa6ddc8dca328c269bdfc8f2534c46ccd2c /wscript | |
| parent | eade5cc8657f51d1d768b705936e918f8d1f53ee (diff) | |
| parent | eb04ac87ccfa046dd342ca7b9e6478c3bdcabbba (diff) | |
Merge branch 'main' into v2.17.x
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -80,6 +80,7 @@ def options(opt): opt.add_option('--warnings-are-errors', action='store_true', default=False, help='build with -Werror') opt.add_option('--wx-config', help='path to wx-config') opt.add_option('--enable-asan', action='store_true', help='build with asan') + opt.add_option('--disable-more-warnings', action='store_true', default=False, help='disable some warnings raised by Xcode 15 with the 2.16 branch') def configure(conf): conf.load('compiler_cxx') @@ -114,19 +115,21 @@ def configure(conf): '-Wwrite-strings', # getMessengerLogger() in the grok code triggers these warnings '-Wno-nonnull', - # These next 5 are for Xcode 15.0.1 with the v2.16.x-era - # dependencies; maybe they aren't necessary when building - # v2.1{7,8}.x '-Wno-error=deprecated', - '-Wno-deprecated-builtins', - '-Wno-deprecated-declarations', - '-Wno-enum-constexpr-conversion', - '-Wno-deprecated-copy', # I tried and failed to ignore these with _Pragma '-Wno-ignored-qualifiers', '-D_FILE_OFFSET_BITS=64', '-std=c++11']) + if conf.options.disable_more_warnings: + # These are for Xcode 15.0.1 with the v2.16.x-era + # dependencies; maybe they aren't necessary when building + # v2.1{7,8}.x + conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-builtins', + '-Wno-deprecated-declarations', + '-Wno-enum-constexpr-conversion', + '-Wno-deprecated-copy']) + if conf.options.warnings_are_errors: conf.env.append_value('CXXFLAGS', '-Werror') |