diff options
-rw-r--r-- | gcc/ChangeLog | 4 | ||||
-rw-r--r-- | gcc/Makefile.in | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c27ce16..4481b6f 100644 --- 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 --- 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 # ------------------------ |