From 9b2bf368d7983b683867656160b8f79870daeb97 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Fri, 27 May 2016 14:50:06 +0000 Subject: [PATCH] configure.ac: Treat a --with-headers option without argument the same as the default (i.e. * configure.ac: Treat a --with-headers option without argument the same as the default (i.e. consult sys-include directory). * configure: Regenerate. From-SVN: r236825 --- gcc/ChangeLog | 6 ++++++ gcc/configure | 2 +- gcc/configure.ac | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0474038530c..85125572cc5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-05-27 Ulrich Weigand + + * configure.ac: Treat a --with-headers option without argument + the same as the default (i.e. consult sys-include directory). + * configure: Regenerate. + 2016-05-27 Kyrylo Tkachov * config/aarch64/aarch64.c (aarch64_fusion_enabled_p): New function. diff --git a/gcc/configure b/gcc/configure index c8d8abcb3a5..9e5cd644b86 100755 --- a/gcc/configure +++ b/gcc/configure @@ -12289,7 +12289,7 @@ elif test "x$TARGET_SYSTEM_ROOT" != x; then fi if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then - if test "x$with_headers" != x; then + if test "x$with_headers" != x && test "x$with_headers" != xyes; then target_header_dir=$with_headers elif test "x$with_sysroot" = x; then target_header_dir="${test_exec_prefix}/${target_noncanonical}/sys-include" diff --git a/gcc/configure.ac b/gcc/configure.ac index ab91de6e4b1..046c94e0a9a 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2035,7 +2035,7 @@ elif test "x$TARGET_SYSTEM_ROOT" != x; then fi if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then - if test "x$with_headers" != x; then + if test "x$with_headers" != x && test "x$with_headers" != xyes; then target_header_dir=$with_headers elif test "x$with_sysroot" = x; then target_header_dir="${test_exec_prefix}/${target_noncanonical}/sys-include" -- 2.30.2