diff options
| author | Matthias Klose <doko@ubuntu.com> | 2012-11-21 16:13:28 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2012-11-21 16:13:28 +0000 |
| commit | 3358fd40546fa1c360f625ca9e7a911ac3ba80cd (patch) | |
| tree | 706530ec416ec2b0e9360dce6dfe9bca8320cd57 /gcc | |
| parent | 5cba83a8a70c9431dc5fc83e93ca09e615cdff02 (diff) | |
| download | gcc-3358fd40546fa1c360f625ca9e7a911ac3ba80cd.zip gcc-3358fd40546fa1c360f625ca9e7a911ac3ba80cd.tar.gz gcc-3358fd40546fa1c360f625ca9e7a911ac3ba80cd.tar.bz2 | |
t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES.
2012-11-21 Matthias Klose <doko@ubuntu.com>
* config/s390/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES.
From-SVN: r193699
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/config/s390/t-linux64 | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5e43601..cdce51e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2012-11-21 Matthias Klose <doko@ubuntu.com> + + * config/s390/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES. + 2012-11-21 Teresa Johnson <tejohnson@google.com> PR gcov-profile/55417 diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64 index ede76a2..cc6ab36 100644 --- a/gcc/config/s390/t-linux64 +++ b/gcc/config/s390/t-linux64 @@ -7,4 +7,5 @@ MULTILIB_OPTIONS = m64/m31 MULTILIB_DIRNAMES = 64 32 -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) +MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu) +MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu) |