Changeset 0a5d205 in rtems-tools for trace/wscript

Timestamp:

06/08/20 06:52:10 (3 years ago)

Author:

Christian Mauderer <christian.mauderer@…>

Branches:

5

Children:

56779ec

Parents:

e621fd9

git-author:

Christian Mauderer <christian.mauderer@…> (06/08/20 06:52:10)

git-committer:

Christian Mauderer <christian.mauderer@…> (08/17/21 09:21:07)

Message:

trace: Use c++14 instead of c++11 if possible

llvm version 10 uses features from c++14 standard in the headers. With
that, the record/record-main-lttng.cc doesn't build any more. This patch
makes sure that c++14 is used if it is available.

Updates #4495

File:

• trace/wscript (modified) (2 diffs)

trace/wscript

@@ -46 +46 @@
         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.write_config_header('config.h')
 
@@ -61 +62 @@
     conf['optflags'] = bld.env.C_OPTS
     conf['cflags'] = ['-pipe', '-g'] + conf['optflags']
-    conf['cxxflags'] = ['-std=c++11'] + conf['cflags']
+    cxxstd = '-std=c++11'
+    if bld.env.HAVE_STD_CXX14:
+        cxxstd = '-std=c++14'
+    conf['cxxflags'] = [cxxstd] + conf['cflags']
     conf['linkflags'] = ['-g']
     conf['lib'] = []