cebadbcf4c
[ci:skip-build] CI fails because of an issue with pmb fetching build deps on subsequent packages in the aggregated list of packages to build, but bpo is expected to pass because it builds packages one at a time
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From c4f484f465a32e796ae384aa3f90e79fa218b4e9 Mon Sep 17 00:00:00 2001
|
|
From: Jingyun Hua <huajingyun@loongson.cn>
|
|
Date: Mon, 7 Aug 2023 15:25:58 +0800
|
|
Subject: [PATCH] loongarch disable multilib support
|
|
|
|
Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
|
|
---
|
|
gcc/config/loongarch/t-linux | 11 +++--------
|
|
1 file changed, 3 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux
|
|
index 23e1fb979..c2753abb8 100644
|
|
--- a/gcc/config/loongarch/t-linux
|
|
+++ b/gcc/config/loongarch/t-linux
|
|
@@ -21,11 +21,6 @@ MULTIOSDIR_lp64f := ../lib64/f32$(call if_multiarch,:loongarch64-linux-gnuf32)
|
|
MULTIOSDIR_lp64s := ../lib64/sf$(call if_multiarch,:loongarch64-linux-gnusf)
|
|
|
|
# Don't define MULTILIB_OSDIRNAMES if multilib is disabled.
|
|
-ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),)
|
|
-
|
|
- MULTILIB_OSDIRNAMES = .=$(MULTIOSDIR_$(mlib_default))
|
|
- MULTILIB_OSDIRNAMES += mabi.lp64d=$(MULTIOSDIR_lp64d)
|
|
- MULTILIB_OSDIRNAMES += mabi.lp64f=$(MULTIOSDIR_lp64f)
|
|
- MULTILIB_OSDIRNAMES += mabi.lp64s=$(MULTIOSDIR_lp64s)
|
|
-
|
|
-endif
|
|
+ MULTILIB_OSDIRNAMES = mabi.lp64d=../lib
|
|
+ MULTILIB_OSDIRNAMES += mabi.lp64f=../lib
|
|
+ MULTILIB_OSDIRNAMES += mabi.lp64s=../lib
|
|
--
|
|
2.41.0
|
|
|