Relintai/osxcross
1
0
Fork 0
mirror of https://github.com/Relintai/osxcross.git synced 2025-02-08 02:55:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various build_gcc.sh fixes (closes #121)

Browse Source
This commit is contained in:
Thomas Pöchtrager 2017-08-13 23:42:37 +02:00
parent 6c5ff4207e
commit 4640f61540
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build_gcc.sh
View File

@ -42,16 +42,16 @@ if [ ! -f "have_gcc_${GCC_VERSION}_${OSXCROSS_TARGET}" ]; then
pushd $OSXCROSS_TARBALL_DIR &>/dev/null pushd $OSXCROSS_TARBALL_DIR &>/dev/null
if [[ $GCC_VERSION != *-* ]]; then if [[ $GCC_VERSION != *-* ]]; then
wget -c "$GCC_MIRROR/releases/gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.bz2" wget -c "$GCC_MIRROR/releases/gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.gz"
else else
wget -c "$GCC_MIRROR/snapshots/$GCC_VERSION/gcc-$GCC_VERSION.tar.bz2" wget -c "$GCC_MIRROR/snapshots/$GCC_VERSION/gcc-$GCC_VERSION.tar.gz"
fi fi
popd &>/dev/null popd &>/dev/null
echo "cleaning up ..." echo "cleaning up ..."
rm -rf gcc* 2>/dev/null rm -rf gcc* 2>/dev/null
extract "$OSXCROSS_TARBALL_DIR/gcc-$GCC_VERSION.tar.bz2" 1 extract "$OSXCROSS_TARBALL_DIR/gcc-$GCC_VERSION.tar.gz" 1
echo "" echo ""
pushd gcc*$GCC_VERSION* &>/dev/null pushd gcc*$GCC_VERSION* &>/dev/null
@ -65,11 +65,15 @@ if [ $(osxcross-cmp $GCC_VERSION '>' 5.0.0) == 1 ] &&
patch -p1 < $PATCH_DIR/gcc-pr66035.patch patch -p1 < $PATCH_DIR/gcc-pr66035.patch
fi fi
if [ $(osxcross-cmp $GCC_VERSION '>=' 6.1.0) == 1 ] &&
[ $(osxcross-cmp $GCC_VERSION '<=' 6.3.0) == 1 ]; then
# https://gcc.gnu.org/ml/gcc-patches/2016-09/msg00129.html
patch -p1 < $PATCH_DIR/gcc-6-buildfix.patch
fi
if [ $(osxcross-cmp $GCC_VERSION '==' 6.3.0) == 1 ]; then if [ $(osxcross-cmp $GCC_VERSION '==' 6.3.0) == 1 ]; then
# https://gcc.gnu.org/viewcvs/gcc/trunk/gcc/config/darwin-driver.c?r1=244010&r2=244009&pathrev=244010 # https://gcc.gnu.org/viewcvs/gcc/trunk/gcc/config/darwin-driver.c?r1=244010&r2=244009&pathrev=244010
patch -p1 < $PATCH_DIR/darwin-driver.c.patch patch -p1 < $PATCH_DIR/darwin-driver.c.patch
# https://gcc.gnu.org/ml/gcc-patches/2016-09/msg00129.html
patch -p1 < $PATCH_DIR/gcc-6.3.0-buildfix.patch
fi fi
mkdir -p build mkdir -p build

0
patches/gcc-6.3.0-buildfix.patch → patches/gcc-6-buildfix.patch
View File