summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-10-10 11:50:57 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-10-10 11:50:57 +0200
commit9b0ca01903ebc782d59c5526cd602a80e8367674 (patch)
treeb26bb4e44b05b37b14ea7b4dda0294675cf314d4
parentca92fe36e07d0d495baef1f860d66925bc0dc165 (diff)
downloadsystemd-9b0ca01903ebc782d59c5526cd602a80e8367674.tar.gz
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.
-rw-r--r--meson.build4
-rw-r--r--test/fuzz/meson.build2
2 files changed, 3 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index 51407098dc..0ebbfce430 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 b411e96915..daec2ead88 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]]