Are we doing something that particularly requires C++17? AFAIK we haven't
needed it yet and why wouldn't it also be needed with gcc? If the default
on recent gcc versions is that, ok but we should be precise in case an
older gcc with a different default is used.
This may also eliminate some hoats.
Just asking configuration management type questions.
--jorl
On Thu, Sep 21, 2023, 8:31 PM JJL772 <jeremy.lorelli.1...@gmail.com> wrote:
> ---
> trace/wscript | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/trace/wscript b/trace/wscript
> index a3dd5d5..0ae90f8 100644
> --- a/trace/wscript
> +++ b/trace/wscript
> @@ -33,11 +33,14 @@ def options(opt):
> def configure(conf):
> conf.load('compiler_c')
> conf.load('compiler_cxx')
> + needs_cxx17 = False
> try:
> cppflags = conf.cmd_and_log(['llvm-config', '--cppflags'])
> ldflags = conf.cmd_and_log(['llvm-config', '--ldflags'])
> conf.env.append_value('CPPFLAGS', cppflags.split())
> conf.env.append_value('LDFLAGS', ldflags.split())
> + # llvm 16+ requires C++17 to build
> + needs_cxx17 = int(conf.cmd_and_log(['llvm-config',
> '--version']).split()[0]) >= 16
> except:
> pass
> if conf.check_cxx(lib = 'LLVM', mandatory=False):
> @@ -46,6 +49,7 @@ def configure(conf):
> conf.check_cxx(lib = 'z')
> conf.check_cxx(lib = 'ws2_32', mandatory=False)
> conf.check_cxx(cxxflags='-std=c++14', mandatory=False,
> define_name="HAVE_STD_CXX14")
> + conf.check_cxx(cxxflags='-std=c++17', mandatory=needs_cxx17,
> define_name="HAVE_STD_CXX17")
> conf.write_config_header('config.h')
>
> def build(bld):
> @@ -63,7 +67,9 @@ def build(bld):
> cstd = '-std=c99'
> conf['cflags'] = [cstd] + ['-pipe', '-g'] + conf['optflags']
> cxxstd = '-std=c++11'
> - if bld.env.HAVE_STD_CXX14:
> + if bld.env.HAVE_STD_CXX17:
> + cxxstd = '-std=c++17'
> + elif bld.env.HAVE_STD_CXX14:
> cxxstd = '-std=c++14'
> conf['cxxflags'] = [cxxstd] + ['-pipe', '-g'] + conf['optflags']
> conf['linkflags'] = ['-g']
> --
> 2.40.1
>
> _______________________________________________
> devel mailing list
> devel@rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
>
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
