mirror of
https://github.com/CloverHackyColor/CloverBootloader.git
synced 2024-11-30 12:43:41 +01:00
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:
parent
3345280983
commit
5db875d2ef
32
buildme
32
buildme
@ -13,11 +13,22 @@
|
||||
|
||||
cd "$(dirname $0)"
|
||||
declare -r CLOVERROOT="$PWD"
|
||||
declare -r MYTOOLCHAIN=${1:-XCODE8}
|
||||
MYTOOLCHAIN=${1:-GCC53}
|
||||
|
||||
TOOLCHAIN_DIR=${TOOLCHAIN_DIR:-$(dirname $CLOVERROOT)/opt/local}
|
||||
|
||||
# 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() {
|
||||
if [[ ! $PATH =~ (^|:)$1(:|$) ]]; then
|
||||
if [[ "${2:-}" = "after" ]]; then
|
||||
@ -64,15 +75,11 @@ export DIR_LOGS=${DIR_LOGS:-$DIR_TOOLS/logs}
|
||||
}
|
||||
|
||||
checkTools() {
|
||||
if [[ "$(uname)" == Darwin && $MYTOOLCHAIN != GCC* ]]; then
|
||||
if [[ "$MYTOOLCHAIN" == XCODE* ]]; then
|
||||
checkXCODE
|
||||
fi
|
||||
|
||||
exportPaths
|
||||
|
||||
if [[ "$(uname)" == Darwin ]]; then
|
||||
checkGETTEXT
|
||||
fi
|
||||
}
|
||||
|
||||
updateClover() {
|
||||
@ -149,9 +156,15 @@ echo "[BUILD CLOVER TEST]"
|
||||
}
|
||||
|
||||
buildPkg() {
|
||||
cd "${CLOVERROOT}"/CloverPackage
|
||||
echo "[BUILD PKG]"
|
||||
make pkg
|
||||
if [[ "$(uname)" == Darwin ]]; then
|
||||
cd "${CLOVERROOT}"/CloverPackage
|
||||
echo "[BUILD PKG]"
|
||||
checkXCODE
|
||||
checkGETTEXT
|
||||
make pkg
|
||||
else
|
||||
echo && echo "can't build pkg on a non Darwin OS!"
|
||||
fi
|
||||
}
|
||||
|
||||
buildIso() {
|
||||
@ -281,6 +294,7 @@ menu
|
||||
|
||||
# Main
|
||||
set -e
|
||||
checkToolchain
|
||||
if [[ "$2" == travis ]]; then
|
||||
buildClover
|
||||
buildPkg
|
||||
|
Loading…
Reference in New Issue
Block a user