From: Luca Boccassi <luca.boccassi@microsoft.com>
Date: Thu, 3 Dec 2020 16:17:43 +0000 (+0000)
Subject: meson: check that cxx variable is set before using it
X-Git-Tag: v248-rc1~581
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=442bc2afee6c5f731c7b3e76ccab7301703a45a7;p=thirdparty%2Fsystemd.git

meson: check that cxx variable is set before using it

In some cases it is not defined. Eg in a yocto build:

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

diff --git a/src/systemd/meson.build b/src/systemd/meson.build
index c9c484b4114..3d328e5fd31 100644
--- a/src/systemd/meson.build
+++ b/src/systemd/meson.build
@@ -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']]