[PULL,06/13] configure: Handle having no c++ compiler in FORTIFY_SOURCE check

Message ID e189091fba4481fa4c9d760f0bf9037620a51989.1499866676.git.mjt@msgid.tls.msk.ru
State New
Headers show
Series
  • Untitled series #2806
Related show

Commit Message

Michael Tokarev July 12, 2017, 1:38 p.m.
From: Peter Maydell <peter.maydell@linaro.org>


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>

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.11.0

Patch

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