]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: check that cxx variable is set before using it
authorLuca Boccassi <luca.boccassi@microsoft.com>
Thu, 3 Dec 2020 16:17:43 +0000 (16:17 +0000)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 4 Dec 2020 07:35:56 +0000 (08:35 +0100)
In some cases it is not defined. Eg in a yocto build:

src/systemd/meson.build:61:15: ERROR: Unknown variable cxx.

src/systemd/meson.build

index c9c484b411407eafea97be39690c854b2fba9029..3d328e5fd31582df320cd147bbfd310205d880ba 100644 (file)
@@ -54,7 +54,7 @@ if cc.has_argument('-std=iso9899:2017')
         opts += [['c', '-std=iso9899:2017']]
 endif
 
-if add_languages('cpp', required : false)
+if cxx_cmd != ''
         opts += [['c++'],
                  ['c++', '-std=c++98'],
                  ['c++', '-std=c++11']]