diff mbox

[arm-embedded,committed] Treat a --with-headers option without argument same as default

Message ID 5821BEAB.9040600@arm.com
State New
Headers show

Commit Message

Andre Vieira (lists) Nov. 8, 2016, 12:01 p.m. UTC 
Hi,

I backported this
https://gcc.gnu.org/ml/gcc-patches/2016-05/msg02196.html to the
embedded-6-branch. Tested on arm-none-eabi.

Committed in revision r241960.

Cheers,
Andre

gcc/ChangeLog.arm:
2016-11-08  Andre Vieira  <andre.simoesdiasvieira@arm.com>

       Backport from mainline
       2016-05-27  Ulrich Weigand  <uweigand@de.ibm.com>

       * configure.ac: Treat a --with-headers option without argument
       the same as the default (i.e. consult sys-include directory).
       * configure: Regenerate.
diff mbox

Patch

diff --git a/gcc/ChangeLog.arm b/gcc/ChangeLog.arm
index 6a1d2f46bc64820b54012c744987f988f556eeff..f45bd18e94e597208132b067607bf186d2e30f09 100644
--- a/gcc/ChangeLog.arm
+++ b/gcc/ChangeLog.arm
@@ -1,3 +1,12 @@ 
+2016-11-08  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+	Backport from mainline
+	2016-05-27  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* configure.ac: Treat a --with-headers option without argument
+	the same as the default (i.e. consult sys-include directory).
+	* configure: Regenerate.
+
 2016-10-27  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
 	Backport from mainline
diff --git a/gcc/configure b/gcc/configure
index fc83cc8ec6efc59c2e014e3c7619f6790fecf9a8..25e5e31a1afdffe8e922e6218705fe11c832edee 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -12263,7 +12263,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 dc22d3ce93c93b8e4874de1ff6560f592eb3ad11..228b58ce32393b2131cc8a4be13713aeb86476f8 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -2019,7 +2019,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"