JehanneOS
/
devtools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

gcc native: unset $CPATH (set in ./hacking/devshell.sh); replace ftp with https in cross/pkgs/gcc/src/gcc/contrib/download_prerequisites

This commit is contained in:
Giacomo Tesio 2019-11-11 00:15:54 +01:00
parent 23c117a97e
commit 655f19e322
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cross/pkgs/gcc/build.sh
View File

@ -6,6 +6,7 @@ export WORKING_DIR="$JEHANNE/hacking/cross/pkgs/gcc"
# include x86_64-jehanne-pkg-config in PATH # include x86_64-jehanne-pkg-config in PATH
export PATH="$JEHANNE/hacking/cross/:$PATH" export PATH="$JEHANNE/hacking/cross/:$PATH"
unset CPATH #set in $JEHANNE/hacking/devshell.sh
function failOnError { function failOnError {
# $1 -> exit status on a previous command # $1 -> exit status on a previous command
@ -117,7 +118,7 @@ fi
make MAKEINFO=true MAKEINFOHTML=true TEXI2DVI=true TEXI2PDF=true DVIPS=true DESTDIR=$JEHANNE/pkgs/binutils/2.33.1/ install 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 ) >> $WORKING_DIR/gcc.build.log 2>&1
failOnError $? "Building binutils" failOnError $? "Building binutils"
fi
echo done. echo done.
# Copy to /posix (to emulate bind during cross compilation) # Copy to /posix (to emulate bind during cross compilation)
@ -136,6 +137,7 @@ fi
pwd && pwd &&
( grep -q jehanne src/gcc/gcc/config.gcc || patch -p1 < patch/gcc.patch ) && ( grep -q jehanne src/gcc/gcc/config.gcc || patch -p1 < patch/gcc.patch ) &&
cp patch/gcc/gcc/config/jehanne.h src/gcc/gcc/config && cp patch/gcc/gcc/config/jehanne.h src/gcc/gcc/config &&
sed -i 's/ftp/https/g' src/gcc/contrib/download_prerequisites &&
cd src && cd src &&
( cd gcc && ./contrib/download_prerequisites ) && ( cd gcc && ./contrib/download_prerequisites ) &&
( cd gcc/libstdc++-v3 && autoconf -i ) && ( cd gcc/libstdc++-v3 && autoconf -i ) &&