gcc native: properly set CPATH and LIBS

This commit is contained in:
Giacomo Tesio 2019-11-18 00:49:15 +01:00
parent 5c3f796756
commit aebce89c7c
2 changed files with 8 additions and 7 deletions

View File

@ -1,3 +1,5 @@
info:
echo "make info does nothing HERE"
all:
echo "make all does nothing HERE"
install:

View File

@ -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