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

continuous-build.sh: set CPATH to workaround cross-compiling issues

This commit is contained in:
Giacomo Tesio 2017-04-22 18:57:05 +02:00
parent b84ab5b731
commit 4d58700318
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
continuous-build.sh
View File

@ -21,9 +21,15 @@ if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then
cd `dirname $0` cd `dirname $0`
cd .. cd ..
export JEHANNE=`pwd` export JEHANNE=`pwd`
CROSS_TOOLCHAIN=$JEHANNE/hacking/cross/toolchain
export PATH="$JEHANNE/hacking/bin:$PATH" export PATH="$JEHANNE/hacking/bin:$PATH"
export PATH="$JEHANNE/hacking/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
# 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
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
echo "Cannot find build tools in $JEHANNE/hacking/bin" echo "Cannot find build tools in $JEHANNE/hacking/bin"

4
cross/pkgs/newlib.sh
View File

@ -31,10 +31,6 @@ export NEWLIB_SRC=$NEWLIB/src/
export NEWLIB_BUILD=$NEWLIB/build/ export NEWLIB_BUILD=$NEWLIB/build/
export NEWLIB_PREFIX=$NEWLIB/output/ export NEWLIB_PREFIX=$NEWLIB/output/
# since our cross compiler is inside the system root, we need this too
export CPATH=$CROSS_DIR/toolchain/lib/gcc/x86_64-jehanne/4.9.4/include:$CROSS_DIR/toolchain/lib/gcc/x86_64-jehanne/4.9.4/include-fixed
function failOnError { function failOnError {
# $1 -> exit status on a previous command # $1 -> exit status on a previous command
# $2 -> task description # $2 -> task description