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 51407098dc25ea3b66e54583363e4dd3da81494c..0ebbfce430e97059658ae4694cacb42f7cd3c554 100644 (file)
--- 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 b411e96915319a3192f0ce2a7211a12375a601aa..daec2ead884af57287b98bb05a5ab2f3891b78a1 100644 (file)
--- 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]]