github
/
AROS-v0
mirror of https://github.com/deadw00d/AROS.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add configuration for building contrib

This commit is contained in:
deadwood 2020-12-25 14:18:16 +01:00
parent 9451924933
commit 87f630e6ea
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/rebuild-conf
View File

@ -3,6 +3,7 @@ show_selection ()
printf " 1) toolchain-core-x86_64\n"
printf " 2) core-linux-x86_64 (DEBUG)\n"
printf " 3) core-pc-x86_64\n"
printf " 4) core-contrib-x86_64\n"
}
process_selection ()
@ -28,6 +29,15 @@ process_selection ()
CONFIGURE_OPTS="--with-aros-toolchain=yes"
MAKE_TARGET_2="bootiso"
;;
4)
TOOLCHAIN_DIR=$(pwd)/toolchain-core-x86_64
BUILD_DIR=$(pwd)/core-contrib-x86_64
CONFIGURE_TARGET=linux-x86_64
CONFIGURE_OPTS="--with-aros-toolchain=yes"
MAKE_TARGET="tools"
MAKE_TARGET_2="mmake"
MAKE_TARGET_3="contrib"
;;
esac
}

7
scripts/rebuild-inc
View File

@ -7,6 +7,7 @@
# BUILD_DIR -> directory where build output will be placed
# MAKE_TARGET -> "make" target to build
# MAKE_TARGET_2 -> second "make" target to build
# MAKE_TARGET_3 -> third "make" target to build
# Note: each valid selection has to set TOOLCHAIN_DIR, BUILD_DIR and
# CONFIGURE_TARGET at minimum in process_selection()
@ -19,7 +20,7 @@ source $(pwd)/AROS/scripts/rebuild-conf
main ()
{
printf "rebuild v1.8, select an option:\n"
printf "rebuild v1.9, select an option:\n"
printf " 0) exit\n"
show_selection
@ -64,6 +65,10 @@ main ()
make $MAKE_TARGET_2 -j 3
MAKE_STATUS=$?
fi
if [[ $MAKE_STATUS = 0 ]] && [[ -n $MAKE_TARGET_3 ]]; then
make $MAKE_TARGET_3 -j 3
MAKE_STATUS=$?
fi
cd ..
# Delete build directory if toolchain is being build and there were no errors