From 85b42bfbba71616831d14360b16998acb28790fd Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Thu, 6 Jan 2022 03:13:59 +0000 Subject: [PATCH 20/35] s390x: disable multilib support multilib is not supported on Alpine GCC at present --- gcc/config/s390/t-linux64 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64 index cc6ab367072..7f498ee1cdc 100644 --- a/gcc/config/s390/t-linux64 +++ b/gcc/config/s390/t-linux64 @@ -7,5 +7,5 @@ MULTILIB_OPTIONS = m64/m31 MULTILIB_DIRNAMES = 64 32 -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) +MULTILIB_OSDIRNAMES = m64=../lib +MULTILIB_OSDIRNAMES+= m32=../lib32 -- 2.41.0