From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 13 Aug 2021 11:09:56 +0000 (+0000)
Subject: binutils+gcc: Fix that the toolchain compiler is trying to link against host libraries
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be79927f181f20df5d9b6e6ea466a33460a7b783;p=people%2Fms%2Fipfire-2.x.git

binutils+gcc: Fix that the toolchain compiler is trying to link against host libraries

Binutils and GCC were misconfigured and used host libraries to build
toolchain programs. That resulted in that those programs were correctly
linked, but could not be executed, because the runtime linker did not
search in the host system.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/binutils b/lfs/binutils
index d94be9a066..94e295cf95 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -59,7 +59,8 @@ ifeq "$(PASS)" "1"
 	--target=$(CROSSTARGET) \
 	--prefix=$(TOOLS_DIR) \
 	--with-sysroot=$(ROOT) \
-	--with-lib-path=$(TOOLS_DIR)/lib
+	--with-lib-path=$(TOOLS_DIR)/lib \
+	--disable-nls
   EXTRA_MAKE =
   EXTRA_INSTALL = 
 else
@@ -69,10 +70,10 @@ else
 	AR="$(CROSSTARGET)-ar" \
 	RANLIB="$(CROSSTARGET)-ranlib"
   EXTRA_CONFIG = \
-	--host=$(BUILDTARGET) \
-	--build=$(BUILDTARGET) \
 	--prefix=$(TOOLS_DIR) \
-	--with-lib-path=$(TOOLS_DIR)/lib
+	--with-lib-path=$(TOOLS_DIR)/lib \
+	--with-sysroot \
+	--disable-nls
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
diff --git a/lfs/gcc b/lfs/gcc
index 96e58ddae2..6bb1d170a8 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -83,8 +83,10 @@ ifeq "$(PASS)" "1"
 	--with-sysroot=$(ROOT) \
 	--with-local-prefix=$(TOOLS_DIR) \
 	--with-native-system-header-dir=$(TOOLS_DIR)/include \
+	--with-glibc-version=2.11 \
 	--disable-nls \
 	--disable-shared \
+	--disable-multilib \
 	--disable-decimal-float \
 	--disable-threads \
 	--disable-libatomic \
@@ -114,13 +116,12 @@ ifeq "$(PASS)" "2"
 	AR="$(CROSSTARGET)-ar" \
 	RANLIB="$(CROSSTARGET)-ranlib"
   EXTRA_CONFIG = \
-	--build=$(BUILDTARGET) \
 	--prefix=$(TOOLS_DIR) \
-	--with-sysroot=$(ROOT) \
 	--with-local-prefix=$(TOOLS_DIR) \
 	--with-native-system-header-dir=$(TOOLS_DIR)/include \
 	--enable-languages=c,c++ \
 	--disable-libstdcxx-pch \
+	--disable-multilib \
 	--disable-libgomp
   EXTRA_MAKE = 
   EXTRA_INSTALL =