aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-06-26 16:25:24 +0100
committerMichael Tokarev <mjt@tls.msk.ru>2017-07-11 11:18:37 +0300
commite189091fba4481fa4c9d760f0bf9037620a51989 (patch)
tree6f0c11736662adef9f7e2522d9042dee37750864
parent667675623dc20b8d2f9ec2eff8a1c7eafcc86e19 (diff)
configure: Handle having no c++ compiler in FORTIFY_SOURCE check
Our FORTIFY_SOURCE check assumes that $cxx refers to a working C++ compiler, with the result that if you don't happen to have one then configure will spuriously print configure: line 4685: c++: command not found Fix this by adding a 'has $cxx' check. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index ce7e8aa842..08ef54103e 100755
--- a/configure
+++ b/configure
@@ -4771,7 +4771,7 @@ fi
if test "$fortify_source" != "no"; then
if echo | $cc -dM -E - | grep __clang__ > /dev/null 2>&1 ; then
fortify_source="no";
- elif test -n "$cxx" &&
+ elif test -n "$cxx" && has $cxx &&
echo | $cxx -dM -E - | grep __clang__ >/dev/null 2>&1 ; then
fortify_source="no";
else