blob: f7b222e812630a66ad52243734fe7656824cc65d [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From 24f74444c00c6c9bf076fb002614ebf6dec31f1a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 28 Dec 2018 09:59:53 -0800
4Subject: [PATCH 39/40] riscv: Disable multilib for OE
5
6Upstream-Status: Inappropriate [OE-Specific]
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 gcc/config/riscv/t-linux | 6 ++++--
11 1 file changed, 4 insertions(+), 2 deletions(-)
12
13diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux
14index 216d2776a18..e4d817621fc 100644
15--- a/gcc/config/riscv/t-linux
16+++ b/gcc/config/riscv/t-linux
17@@ -1,3 +1,5 @@
18 # Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/
19-MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
20-MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
21+#MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
22+MULTILIB_DIRNAMES := . .
23+#MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
24+MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
25--
262.21.0
27