From 0ed82d2f506bdd641b72f994181be2f4a55256b1 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 14 Sep 2024 16:05:47 +0200 Subject: [PATCH] Add C++17 option to force compiles to use std=cxx17 --- wscript | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index f5aa95d68f..f6d13854d6 100644 --- a/wscript +++ b/wscript @@ -566,9 +566,14 @@ int main() { return 0; }''', cxx_flags.append('--stdlib=libc++') linker_flags.append('--stdlib=libc++') - if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' , 'bigsur', 'monterey', 'ventura', 'sonoma' ]: + if conf.options.cxx17 or conf.env['build_host'] in [ 'bigsur', 'monterey', 'ventura', 'sonoma' ]: + conf.check_cxx(cxxflags=["-std=c++17"]) + cxx_flags.append('-std=c++17') + elif conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' ]: conf.check_cxx(cxxflags=["-std=c++11"]) cxx_flags.append('-std=c++11') + + if conf.options.cxx11 or conf.options.cxx17 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' , 'bigsur', 'monterey', 'ventura', 'sonoma' ]: if platform == "darwin": # Mavericks and later changed the syntax to be used when including Carbon headers, # from requiring a full path to requiring just the header name. @@ -960,6 +965,8 @@ def options(opt): help='Do not ask questions that require confirmation during the build') opt.add_option('--cxx11', action='store_true', default=False, dest='cxx11', help='Turn on c++11 compiler flags (-std=c++11)') + opt.add_option('--cxx17', action='store_true', default=False, dest='cxx17', + help='Turn on c++17 compiler flags (-std=c++17)') opt.add_option('--use-libc++', action='store_true', default=False, dest='use_libcpp', help='Use libc++ instead of default or auto-detected stdlib') opt.add_option('--address-sanitizer', action='store_true', default=False, dest='asan', @@ -1267,7 +1274,7 @@ int main () { int x = SFC_RF64_AUTO_DOWNGRADE; return 0; } conf.env.append_value('CFLAGS', '-DCOMPILER_MINGW') conf.env.append_value('CXXFLAGS', '-DPLATFORM_WINDOWS') conf.env.append_value('CXXFLAGS', '-DCOMPILER_MINGW') - if conf.options.cxx11: + if conf.options.cxx11 or conf.options.cxx17: conf.env.append_value('CFLAGS', '-D_USE_MATH_DEFINES') conf.env.append_value('CXXFLAGS', '-D_USE_MATH_DEFINES') conf.env.append_value('CFLAGS', '-DWIN32')