From 4fcfc23b4a23cc0e641a3dc3759c00ce439226a4 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 5 Feb 2021 09:48:08 -0500 Subject: [PATCH] riscv64: Move libraries back to /usr/lib64 Signed-off-by: Michael Tremer --- lfs/stage1 | 4 ++++ lfs/stage2 | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/lfs/stage1 b/lfs/stage1 index 5ad5f11070..1b448d1a4a 100644 --- a/lfs/stage1 +++ b/lfs/stage1 @@ -54,4 +54,8 @@ ifeq "$(IS_64BIT)" "1" ln -svf lib $(TOOLS_DIR)/lib64 endif +ifeq "$(BUILD_ARCH)" "riscv64" + ln -svf . $(TOOLS_DIR)/lib/lp64d +endif + @$(POSTBUILD) diff --git a/lfs/stage2 b/lfs/stage2 index 2863d6b697..efa9622e72 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -69,6 +69,11 @@ ifeq "$(IS_64BIT)" "1" ln -svf lib /usr/lib64 endif +ifeq "$(BUILD_ARCH)" "riscv64" + ln -svf . /lib/lp64d + ln -svf . /usr/lib/lp64d +endif + # Symlinks # for this reason, stage2 rebuild will broke the iso:perl, grubbatch -ln -sv $(TOOLS_DIR)/bin/{bash,cat,echo,pwd,stty} /bin -- 2.39.5