26 lines
1 KiB
Diff
26 lines
1 KiB
Diff
From 96e7e1e9a899d9bb5fcbdf788bd529d0390c626f Mon Sep 17 00:00:00 2001
|
|
From: Ariadne Conill <ariadne@dereferenced.org>
|
|
Date: Thu, 6 Jan 2022 03:14:54 +0000
|
|
Subject: [PATCH 22/35] x86_64: disable multilib support
|
|
|
|
multilib is not presently supported on Alpine GCC
|
|
---
|
|
gcc/config/i386/t-linux64 | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
|
|
index 138956b0962..bc03dab874f 100644
|
|
--- a/gcc/config/i386/t-linux64
|
|
+++ b/gcc/config/i386/t-linux64
|
|
@@ -33,6 +33,6 @@
|
|
comma=,
|
|
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
|
|
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
|
|
-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
|
|
-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
|
|
+MULTILIB_OSDIRNAMES = m64=../lib
|
|
+MULTILIB_OSDIRNAMES+= m32=../lib32
|
|
MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
|
|
--
|
|
2.41.0
|
|
|