From aebce89c7c557ac485c5b75775f404681291009f Mon Sep 17 00:00:00 2001
From: Giacomo Tesio <giacomo@tesio.it>
Date: Mon, 18 Nov 2019 00:49:15 +0100
Subject: [PATCH] gcc native: properly set CPATH and LIBS

---
 cross/patch/MakeNothing.in |  2 ++
 cross/pkgs/gcc/build.sh    | 13 ++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cross/patch/MakeNothing.in b/cross/patch/MakeNothing.in
index 5f28461..025d5ca 100644
--- a/cross/patch/MakeNothing.in
+++ b/cross/patch/MakeNothing.in
@@ -1,3 +1,5 @@
+info:
+	echo "make info does nothing HERE"
 all:
 	echo "make all does nothing HERE"
 install:
diff --git a/cross/pkgs/gcc/build.sh b/cross/pkgs/gcc/build.sh
index e4514c6..cc2a6b2 100755
--- a/cross/pkgs/gcc/build.sh
+++ b/cross/pkgs/gcc/build.sh
@@ -90,9 +90,8 @@ cp -pfr $JEHANNE/pkgs/libmpc/1.1.0/posix/* $JEHANNE/posix
 
 echo -n Building binutils... | tee -a $WORKING_DIR/gcc.build.log
 
-export LDFLAGS="$JEHANNE/posix/lib/libc.a $JEHANNE/posix/lib/libm.a $JEHANNE/posix/lib/libg.a -lposix -lc"
-export LIBS="$JEHANNE/posix/lib/libc.a $JEHANNE/posix/lib/libm.a $JEHANNE/posix/lib/libg.a -lposix -lc"
-export CPATH=$JEHANNE/posix/include:$CPATH:$JEHANNE/arch/amd64/include/:$JEHANNE/sys/include/apw/:$JEHANNE/sys/include/
+export CPATH="$JEHANNE/posix/include:$JEHANNE/sys/include:$JEHANNE/hacking/cross/toolchain/lib/gcc/x86_64-jehanne/9.2.0/include:$JEHANNE/hacking/cross/toolchain/lib/gcc/x86_64-jehanne/9.2.0/include-fixed"
+export LIBS="-L$JEHANNE/posix/lib $JEHANNE/posix/lib/libc.a $JEHANNE/arch/amd64/lib/libposix.a $JEHANNE/arch/amd64/lib/libc.a"
 
 # Patch and build binutils
 if [ "$BINUTILS_BUILD_DIR" = "" ]; then
@@ -115,10 +114,10 @@ fi
 	cd src/binutils/ld && automake-1.15 && cd ../ ) ) &&
 	mkdir -p $BINUTILS_BUILD_DIR && cd $BINUTILS_BUILD_DIR &&
 	$WORKING_DIR/src/binutils/configure --host=x86_64-jehanne --prefix=/posix --with-sysroot=$JEHANNE --target=x86_64-jehanne --enable-interwork --enable-multilib --disable-nls --disable-werror &&
-	cp $WORKING_DIR/../../patch/MakeNothing.in $WORKING_DIR/src/binutils/bfd/doc/Makefile &&
-	cp $WORKING_DIR/../../patch/MakeNothing.in $WORKING_DIR/src/binutils/bfd/po/Makefile &&
-	cp $WORKING_DIR/../../patch/MakeNothing.in $WORKING_DIR/src/binutils/gas/doc/Makefile &&
-	cp $WORKING_DIR/../../patch/MakeNothing.in $WORKING_DIR/src/binutils/binutils/doc/Makefile &&
+	cp $WORKING_DIR/../../patch/MakeNothing.in $WORKING_DIR/src/binutils/bfd/doc/ &&
+	cp $WORKING_DIR/../../patch/MakeNothing.in $WORKING_DIR/src/binutils/bfd/po/ &&
+	cp $WORKING_DIR/../../patch/MakeNothing.in $WORKING_DIR/src/binutils/gas/doc/ &&
+	cp $WORKING_DIR/../../patch/MakeNothing.in $WORKING_DIR/src/binutils/binutils/doc/ &&
 	make MAKEINFO=true MAKEINFOHTML=true TEXI2DVI=true TEXI2PDF=true DVIPS=true && 
 	make MAKEINFO=true MAKEINFOHTML=true TEXI2DVI=true TEXI2PDF=true DVIPS=true DESTDIR=$JEHANNE/pkgs/binutils/2.33.1/ install
 ) >> $WORKING_DIR/gcc.build.log 2>&1