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

continuous-build.sh: update GCC version and paths

Browse Source
This commit is contained in:
Giacomo Tesio 2020-09-03 00:58:28 +02:00
parent 48f5a46734
commit 8e890d973c
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
continuous-build.sh
View File

@ -6,11 +6,19 @@
set -e set -e
cd `dirname $0`
cd ..
export JEHANNE=`pwd`
REPONAME=`basename $JEHANNE`
export JEHANNE_TOOLCHAIN=`dirname $JEHANNE`
export JEHANNE_TOOLCHAIN="$JEHANNE_TOOLCHAIN/$REPONAME.TOOLCHAIN"
CROSS_TOOLCHAIN=$JEHANNE_TOOLCHAIN/cross/posix
function finish { function finish {
if [ "$TRAVIS_BUILD_DIR" != "" ]; then if [ "$TRAVIS_BUILD_DIR" != "" ]; then
# ensure that we preserve the toolchain on broken build/test # ensure that we preserve the toolchain on broken build/test
if [ -f "$JEHANNE/hacking/cross/toolchain/bin/x86_64-jehanne-gcc" ]; then if [ -f "$CROSS_TOOLCHAIN/bin/x86_64-jehanne-gcc" ]; then
mv $JEHANNE/hacking/cross/toolchain/* $JEHANNE/tmp/toolchain/ mv $CROSS_TOOLCHAIN/* $JEHANNE/tmp/toolchain/
fi fi
fi fi
(cd $JEHANNE/hacking; git clean -xdf disk-setup/; git checkout disk-setup/syslinux.cfg) (cd $JEHANNE/hacking; git clean -xdf disk-setup/; git checkout disk-setup/syslinux.cfg)
@ -18,17 +26,14 @@ function finish {
trap finish EXIT trap finish EXIT
if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then
cd `dirname $0`
cd ..
export JEHANNE=`pwd`
CROSS_TOOLCHAIN=$JEHANNE/hacking/cross/toolchain
export PATH="$JEHANNE/hacking/bin:$PATH" export PATH="$JEHANNE/hacking/bin:$PATH"
export PATH="$CROSS_TOOLCHAIN/bin:$PATH" export PATH="$CROSS_TOOLCHAIN/bin:$PATH"
export ARCH=amd64 export ARCH=amd64
# since our cross compiler is inside the system root, we need this too # since our cross compiler is inside the system root, we need this too
# as it can't find it's own headers # as it can't find it's own headers
export CPATH=$CROSS_TOOLCHAIN/lib/gcc/x86_64-jehanne/4.9.4/include:$CROSS_TOOLCHAIN/lib/gcc/x86_64-jehanne/4.9.4/include-fixed export CPATH=$CROSS_TOOLCHAIN/lib/gcc/x86_64-jehanne/9.2.0/include:$CROSS_TOOLCHAIN/lib/gcc/x86_64-jehanne/9.2.0/include-fixed
git clean -xdf arch/ sys/ qa/ usr/ git clean -xdf arch/ sys/ qa/ usr/
if [ ! -f "$JEHANNE/hacking/bin/ufs" ]; then if [ ! -f "$JEHANNE/hacking/bin/ufs" ]; then