diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-10-04 04:52:44 +0900 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-10-09 11:54:10 +0200 |
commit | f6d783ac3d145f3f3ffc2023d4ad90f76cf7fe34 (patch) | |
tree | 756aaa30aa6ee4a72dd92d7132eb4834c500d496 | |
parent | b37469d7d109414fdce9af8cb3331445b95dd6c0 (diff) | |
download | systemd-f6d783ac3d145f3f3ffc2023d4ad90f76cf7fe34.tar.gz |
meson: use same compilers to build fuzzers
-rw-r--r-- | test/fuzz/meson.build | 4 | ||||
-rwxr-xr-x | tools/meson-build.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/test/fuzz/meson.build b/test/fuzz/meson.build index 56d0f69660..b4aadaab2e 100644 --- a/test/fuzz/meson.build +++ b/test/fuzz/meson.build @@ -7,7 +7,9 @@ sanitize_address = custom_target( meson.source_root(), '@OUTPUT@', 'fuzzers', - '-Db_lundef=false -Db_sanitize=address']) + '-Db_lundef=false -Db_sanitize=address', + ' '.join(cc.cmd_array()), + ' '.join(meson.get_compiler('cpp').cmd_array())]) sanitizers = [['address', sanitize_address]] diff --git a/tools/meson-build.sh b/tools/meson-build.sh index 317dad932d..dea554177d 100755 --- a/tools/meson-build.sh +++ b/tools/meson-build.sh @@ -5,8 +5,10 @@ src="$1" dst="$2" target="$3" options="$4" +CC="$5" +CXX="$6" -[ -f "$dst/ninja.build" ] || meson "$src" "$dst" $options +[ -f "$dst/ninja.build" ] || CC="$CC" CXX="$CXX" meson "$src" "$dst" $options # Locate ninja binary, on CentOS 7 it is called ninja-build, so # use that name if available. |