configure: Handle having no c++ compiler in FORTIFY_SOURCE check

[Qemu-devel] [PATCH] configure: Handle having no c++ compiler in FORTIFY_SOURCE check

Peter Maydell posted 1 patch 6 years, 10 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1498490724-20674-1-git-send-email-peter.maydell@linaro.org

Test FreeBSD passed

Test checkpatch passed

Test docker passed

Test s390x passed

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

Expand all Fold all

[Qemu-devel] [PATCH] configure: Handle having no c++ compiler in FORTIFY_SOURCE check

Posted by Peter Maydell 6 years, 10 months ago

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>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index c571ad1..a435908 100755
--- a/configure
+++ b/configure
@@ -4681,7 +4681,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
-- 
2.7.4

Re: [Qemu-devel] [PATCH] configure: Handle having no c++ compiler in FORTIFY_SOURCE check

Posted by Philippe Mathieu-Daudé 6 years, 10 months ago

On 06/26/2017 12:25 PM, Peter Maydell wrote:
> 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>

> ---
>   configure | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index c571ad1..a435908 100755
> --- a/configure
> +++ b/configure
> @@ -4681,7 +4681,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
>

Re: [Qemu-devel] [PATCH] configure: Handle having no c++ compiler in FORTIFY_SOURCE check

Posted by Michael Tokarev 6 years, 10 months ago

Applied to trivial, thanks!

/mjt