Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2025-01-22 21:01:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

add build_gcc9.sh patches and workarounds for Catalina

Browse Source
This commit is contained in:
asava 2019-10-23 23:41:30 +03:00
parent 5cfeecbb6c
commit ade55d54a5
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build_gcc9.sh
View File

@ -76,6 +76,7 @@ CheckXCode () {
local OSXVER="`/usr/bin/sw_vers -productVersion | cut -d '.' -f1,2`" local OSXVER="`/usr/bin/sw_vers -productVersion | cut -d '.' -f1,2`"
local OSXARCH="`/usr/bin/uname -m`" local OSXARCH="`/usr/bin/uname -m`"
local OSXREV="`/usr/bin/uname -r`" local OSXREV="`/usr/bin/uname -r`"
export BUILDVER="$OSXVER"
export BUILDARCH="$OSXARCH" export BUILDARCH="$OSXARCH"
export BUILDREV="$OSXREV" export BUILDREV="$OSXREV"
echo " Running on Mac OS X ${OSXVER}, with ${OSXARCH} architecture." echo " Running on Mac OS X ${OSXVER}, with ${OSXARCH} architecture."
@ -238,6 +239,13 @@ CompileLibs () {
rm -rf "${DIR_BUILD}/$ARCH-gmp" rm -rf "${DIR_BUILD}/$ARCH-gmp"
mkdir -p "${DIR_BUILD}/$ARCH-gmp" && cd "${DIR_BUILD}/$ARCH-gmp" mkdir -p "${DIR_BUILD}/$ARCH-gmp" && cd "${DIR_BUILD}/$ARCH-gmp"
# building gmp on Catalina currently requires no-stack-check flag
if [[ "${BUILDVER}" == "10.15" ]]; then
echo "- ${GMP_VERSION} applying Catalina flag..."
export CPPFLAGS="-fno-stack-check"
fi
echo "- ${GMP_VERSION} configure..." echo "- ${GMP_VERSION} configure..."
"${GMP_DIR}"/configure --prefix=$PREFIX > $DIR_LOGS/gmp.$ARCH.configure.log.txt 2>&1 "${GMP_DIR}"/configure --prefix=$PREFIX > $DIR_LOGS/gmp.$ARCH.configure.log.txt 2>&1
echo "- ${GMP_VERSION} make..." echo "- ${GMP_VERSION} make..."
@ -246,6 +254,11 @@ CompileLibs () {
rm -rf "${DIR_BUILD}/$ARCH-gmp" "$GMP_DIR" rm -rf "${DIR_BUILD}/$ARCH-gmp" "$GMP_DIR"
echo "- ${GMP_VERSION} installed in $PREFIX" echo "- ${GMP_VERSION} installed in $PREFIX"
# unset flag which was set for Catalina
if [[ "${BUILDVER}" == "10.15" ]]; then
unset CPPFLAGS
fi
fi fi
if [[ ! -f $PREFIX/include/mpfr.h ]]; then if [[ ! -f $PREFIX/include/mpfr.h ]]; then
@ -451,6 +464,12 @@ CompileCrossGCC () {
# Extract the tarball # Extract the tarball
local GCC_DIR=$(ExtractTarball "gcc-${GCC_VERSION}.tar.xz") local GCC_DIR=$(ExtractTarball "gcc-${GCC_VERSION}.tar.xz")
if [[ "${BUILDVER}" == "10.15" ]]; then
echo "- gcc-${GCC_VERSION} applying Catalina patch and path..."
curl -L https://raw.githubusercontent.com/Homebrew/formula-patches/b8b8e65e/gcc/9.2.0-catalina.patch | patch -N -Z -p1 --directory="${GCC_DIR}"
export CPATH=$SDK/usr/include
fi
local BUILD_DIR="${DIR_BUILD}/$ARCH-gcc-cross" local BUILD_DIR="${DIR_BUILD}/$ARCH-gcc-cross"
rm -rf "$BUILD_DIR" rm -rf "$BUILD_DIR"
mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR" mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"
@ -478,6 +497,11 @@ CompileCrossGCC () {
unset BOOT_CFLAGS unset BOOT_CFLAGS
unset BOOT_CPPFLAGS unset BOOT_CPPFLAGS
# unset path which was set for Catalina
if [[ "${BUILDVER}" == "10.15" ]]; then
unset CPATH
fi
[[ ! -x $PREFIX/cross/bin/$TARGET-gcc ]] && \ [[ ! -x $PREFIX/cross/bin/$TARGET-gcc ]] && \
echo "Error: gcc-${GCC_VERSION} not installed, check logs in $DIR_LOGS" && exit 1 echo "Error: gcc-${GCC_VERSION} not installed, check logs in $DIR_LOGS" && exit 1