From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 10 Oct 2018 09:50:57 +0000 (+0200)
Subject: meson: rename cpp_cmd to cxx_cmd
X-Git-Tag: v240~584^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b0ca01903ebc782d59c5526cd602a80e8367674;p=thirdparty%2Fsystemd.git

meson: rename cpp_cmd to cxx_cmd

cpp is a really bad alias for c++ because it's also the name of the
preprocessor. Let's rename the variable.
---

diff --git a/meson.build b/meson.build
index 51407098dc2..0ebbfce430e 100644
--- a/meson.build
+++ b/meson.build
@@ -278,9 +278,9 @@ cxx = find_program('c++', required : false)
 if cxx.found()
         #  Used only for tests
         add_languages('cpp')
-        cpp_cmd = ' '.join(meson.get_compiler('cpp').cmd_array())
+        cxx_cmd = ' '.join(meson.get_compiler('cpp').cmd_array())
 else
-        cpp_cmd = ''
+        cxx_cmd = ''
 endif
 
 want_ossfuzz = get_option('oss-fuzz')
diff --git a/test/fuzz/meson.build b/test/fuzz/meson.build
index b411e969153..daec2ead884 100644
--- a/test/fuzz/meson.build
+++ b/test/fuzz/meson.build
@@ -9,7 +9,7 @@ sanitize_address = custom_target(
                    'fuzzers',
                    '-Db_lundef=false -Db_sanitize=address',
                    ' '.join(cc.cmd_array()),
-                   cpp_cmd])
+                   cxx_cmd])
 
 sanitizers = [['address', sanitize_address]]