diff mbox series

[05/28] binutils+gcc: Fix that the toolchain compiler is trying to link against host libraries

Message ID 20220204164748.315559-5-michael.tremer@ipfire.org
State Accepted
Commit e111b836b3f86c9ff34d09ab30c9daf4223965e7
Headers
Series [01/28] gcc: toolchain stage 2: Set sysroot to /tools_${arch} |

Commit Message

Michael Tremer Feb. 4, 2022, 4:47 p.m. UTC 
  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>
---
 lfs/binutils | 9 +++++----
 lfs/gcc      | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/lfs/binutils b/lfs/binutils
index d94be9a06..94e295cf9 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 96e58ddae..6bb1d170a 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 =