diff options
| author | Matthias Klose <doko@ubuntu.com> | 2012-11-15 11:58:42 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2012-11-15 11:58:42 +0000 |
| commit | 9eae39049bcb0e0311e8bf49dd4cfb059d80ea50 (patch) | |
| tree | 36cb31c9164c2c577d05faad64d343ea61baf801 | |
| parent | d28bdb60d77cb5cda820295a1d4185c477fe80e1 (diff) | |
| download | gcc-9eae39049bcb0e0311e8bf49dd4cfb059d80ea50.zip gcc-9eae39049bcb0e0311e8bf49dd4cfb059d80ea50.tar.gz gcc-9eae39049bcb0e0311e8bf49dd4cfb059d80ea50.tar.bz2 | |
Makefile.in (if_multiarch): Don't use a GNU make 3.81 feature.
2012-11-15 Matthias Klose <doko@ubuntu.com>
* Makefile.in (if_multiarch): Don't use a GNU make 3.81 feature.
From-SVN: r193529
| -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 # ------------------------ |