GCC53 is the default toolchain

GCC53 is the default toolchain. If x86_64-clover-linux-gnu-gcc (on macOS) is not found then XCODE8 will be used.
This commit is contained in:
vectorsigma72 2019-09-15 20:06:04 +02:00
parent 3345280983
commit 5db875d2ef

32
buildme
View File

@ -13,11 +13,22 @@
cd "$(dirname $0)" cd "$(dirname $0)"
declare -r CLOVERROOT="$PWD" declare -r CLOVERROOT="$PWD"
declare -r MYTOOLCHAIN=${1:-XCODE8} MYTOOLCHAIN=${1:-GCC53}
TOOLCHAIN_DIR=${TOOLCHAIN_DIR:-$(dirname $CLOVERROOT)/opt/local} TOOLCHAIN_DIR=${TOOLCHAIN_DIR:-$(dirname $CLOVERROOT)/opt/local}
# Functions # Functions
checkToolchain() {
local GCC53_BIN="$TOOLCHAIN_DIR/cross/bin/x86_64-clover-linux-gnu-gcc"
# in Linux ebuild.sh force to use the CGG toolchain
if [[ "$(uname)" == Darwin ]]; then
if [[ $MYTOOLCHAIN == GCC* ]] && [[ ! -x "${GCC53_BIN}" ]]; then
MYTOOLCHAIN=XCODE8
fi
fi
}
pathmunge() { pathmunge() {
if [[ ! $PATH =~ (^|:)$1(:|$) ]]; then if [[ ! $PATH =~ (^|:)$1(:|$) ]]; then
if [[ "${2:-}" = "after" ]]; then if [[ "${2:-}" = "after" ]]; then
@ -64,15 +75,11 @@ export DIR_LOGS=${DIR_LOGS:-$DIR_TOOLS/logs}
} }
checkTools() { checkTools() {
if [[ "$(uname)" == Darwin && $MYTOOLCHAIN != GCC* ]]; then if [[ "$MYTOOLCHAIN" == XCODE* ]]; then
checkXCODE checkXCODE
fi fi
exportPaths exportPaths
if [[ "$(uname)" == Darwin ]]; then
checkGETTEXT
fi
} }
updateClover() { updateClover() {
@ -149,9 +156,15 @@ echo "[BUILD CLOVER TEST]"
} }
buildPkg() { buildPkg() {
cd "${CLOVERROOT}"/CloverPackage if [[ "$(uname)" == Darwin ]]; then
echo "[BUILD PKG]" cd "${CLOVERROOT}"/CloverPackage
make pkg echo "[BUILD PKG]"
checkXCODE
checkGETTEXT
make pkg
else
echo && echo "can't build pkg on a non Darwin OS!"
fi
} }
buildIso() { buildIso() {
@ -281,6 +294,7 @@ menu
# Main # Main
set -e set -e
checkToolchain
if [[ "$2" == travis ]]; then if [[ "$2" == travis ]]; then
buildClover buildClover
buildPkg buildPkg