From 3358fd40546fa1c360f625ca9e7a911ac3ba80cd Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 21 Nov 2012 16:13:28 +0000 Subject: [PATCH] t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES. 2012-11-21 Matthias Klose * config/s390/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES. From-SVN: r193699 --- gcc/ChangeLog | 4 ++++ gcc/config/s390/t-linux64 | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5e436013000..cdce51e7b58 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2012-11-21 Matthias Klose + + * config/s390/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES. + 2012-11-21 Teresa Johnson PR gcov-profile/55417 diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64 index ede76a2cbf3..cc6ab367072 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) -- 2.11.4.GIT