Add linker path to toolchain build

Signed-off-by: Vincent Li <vincent.mc.li@gmail.com>
2026-04-09 10:35:53 +02:00 · 2024-12-16 18:46:13 -08:00
parent 8a0ca16bae
commit a0eed98b22
31 changed files with 240 additions and 1 deletions
--- a/lfs/Config
+++ b/lfs/Config
@@ -480,7 +480,7 @@ define INSTALL_INITSCRIPTS
    done
 endef

-ifeq "$(BUILD_ARCH)" "$(filter $(BUILD_ARCH),aarch64 riscv64)"
+ifeq "$(BUILD_ARCH)" "$(filter $(BUILD_ARCH),aarch64 riscv64 loongarch64)"
 define UPDATE_AUTOMAKE
 	for i in $$(find $(DIR_APP) -name config.guess -o -name config.sub); do \
 		cp -vf /usr/share/automake*/$$(basename $${i}) $${i} || \
--- a/lfs/automake
+++ b/lfs/automake
@@ -40,6 +40,14 @@ else
 	TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/bash
+++ b/lfs/bash
@@ -45,6 +45,14 @@ endif
 CONFIGURE_OPTIONS += \
 	--without-bash-malloc

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/bison
+++ b/lfs/bison
@@ -37,6 +37,14 @@ else
  TARGET = $(DIR_INFO)/$(THISAPP)
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/bzip2
+++ b/lfs/bzip2
@@ -39,6 +39,14 @@ else
  TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -32,6 +32,14 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-tools

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+	CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+	LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -50,6 +50,14 @@ CONFIGURE_OPTIONS += \

 CFLAGS += -fno-strict-aliasing

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+	CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+	LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/diffutils
+++ b/lfs/diffutils
@@ -39,6 +39,14 @@ else
  TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/expect
+++ b/lfs/expect
@@ -32,6 +32,14 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-tools

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/fake-environ
+++ b/lfs/fake-environ
@@ -30,6 +30,14 @@ THISAPP    = fake-environ
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-tools

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/findutils
+++ b/lfs/findutils
@@ -42,6 +42,14 @@ else
  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls --build=$(BUILDTARGET)
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/flex
+++ b/lfs/flex
@@ -43,6 +43,13 @@ else
  TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif

 ###############################################################################
 # Top-level Rules
--- a/lfs/gawk
+++ b/lfs/gawk
@@ -41,6 +41,14 @@ else
 	EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/gettext
+++ b/lfs/gettext
@@ -48,6 +48,14 @@ else
 		--build=$(BUILDTARGET)
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -74,6 +74,14 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 	EXTRA_CONFIG += --enable-memory-tagging
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/grep
+++ b/lfs/grep
@@ -42,6 +42,14 @@ else
    --disable-perl-regexp --without-included-regex
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/gzip
+++ b/lfs/gzip
@@ -41,6 +41,14 @@ else
  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/m4
+++ b/lfs/m4
@@ -39,6 +39,14 @@ else
  TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/make
+++ b/lfs/make
@@ -51,6 +51,14 @@ ifeq "$(PASS)" "1"
  CFLAGS =
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+	CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+	LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -51,6 +51,14 @@ EXTRA_CONFIG += \
 	--mandir=/usr/share/man \
 	--with-pkg-config-libdir=/usr/lib/pkgconfig

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/patch
+++ b/lfs/patch
@@ -39,6 +39,14 @@ else
  TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/perl
+++ b/lfs/perl
@@ -39,6 +39,14 @@ else
  TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 # Perl does not build with -j larger than 23
 MAX_PARALLELISM = 23

--- a/lfs/pkg-config
+++ b/lfs/pkg-config
@@ -40,6 +40,14 @@ else
  TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/python3
+++ b/lfs/python3
@@ -55,6 +55,14 @@ else
 	--without-ensurepip
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/sed
+++ b/lfs/sed
@@ -45,6 +45,14 @@ else
  EXTRA_INSTALL =
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/tar
+++ b/lfs/tar
@@ -42,6 +42,14 @@ else
  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/tcl
+++ b/lfs/tcl
@@ -37,6 +37,14 @@ else
 TARGET     = $(DIR_INFO)/$(THISAPP)
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/texinfo
+++ b/lfs/texinfo
@@ -39,6 +39,14 @@ else
  TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/xz
+++ b/lfs/xz
@@ -37,6 +37,14 @@ else
 	TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+        CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+        LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -40,6 +40,14 @@ endif

 CFLAGS    += -fPIC -DPIC

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+	CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+	LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/zstd
+++ b/lfs/zstd
@@ -41,6 +41,14 @@ else
  CC = gcc
 endif

+# Only for TOOLCHAIN == 1 and BUILD_ARCH == loongarch64
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(BUILD_ARCH)" "loongarch64"
+	CFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+	LDFLAGS += -Wl,--dynamic-linker=$(TOOLS_DIR)/lib64/ld-linux-loongarch-lp64d.so.1
+ endif
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################