2012-11-15 Matthias Klose <doko@ubuntu.com>

        * Makefile.in (if_multiarch): Don't use a GNU make 3.81 feature.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193529 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c27ce16..4481b6f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-15  Matthias Klose  <doko@ubuntu.com>
+
+       * Makefile.in (if_multiarch): Don't use a GNU make 3.81 feature.
+
 2012-11-14  Jan Hubicka  <jh@suse.cz>
 
        PR bootstrap/55051

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index fb2fd86..ec13e2d 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -535,11 +535,13 @@ enable_multiarch = @enable_multiarch@
 with_float = @with_float@
 ifeq ($(enable_multiarch),yes)
   if_multiarch = $(1)
-else ifeq ($(enable_multiarch),auto)
-  # SYSTEM_HEADER_DIR is makefile syntax, cannot be evaluated in configure.ac
-  if_multiarch = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib/*/crti.o),$(1))
 else
-  if_multiarch =
+  ifeq ($(enable_multiarch),auto)
+    # SYSTEM_HEADER_DIR is makefile syntax, cannot be evaluated in configure.ac
+    if_multiarch = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib/*/crti.o),$(1))
+  else
+    if_multiarch =
+  endif
 endif
 
 # ------------------------