From 29a602cb801285bed6ef97784256d33017786397 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Mon, 8 Mar 2010 14:49:10 +0000 Subject: Update rockboxdev.sh/configure for arm-elf-eabi-gcc 4.4.3 and binutils 2.20.1. Additional slight change to rockboxdev.sh: strip the gcc folder from the patch paths (which contains the version), so that patches aren't strictly dependant on the gcc version. Add a sanity check for the case the patch fails to apply. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25070 a1c6a512-1295-4272-9138-f99709370657 --- tools/rockboxdev.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'tools/rockboxdev.sh') diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh index a8efdd1dc0..82f20ef98f 100755 --- a/tools/rockboxdev.sh +++ b/tools/rockboxdev.sh @@ -194,12 +194,11 @@ case $arch in [Ee]) target="arm-elf-eabi" gccpatch="rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-4.4.2_1.diff" - binutilsconf="--disable-werror" - gccver="4.4.2" + gccver="4.4.3" # needed to build a bare-metal gcc-4.4.2 gcctarget="all-gcc all-target-libgcc" gccinstalltarget="install-gcc install-target-libgcc" - binutils="2.20" + binutils="2.20.1" ;; [Ii]) target="mipsel-elf" @@ -299,7 +298,13 @@ bunzip2 < $dlwhere/gcc-core-$gccver.tar.bz2 | tar xf - if test -n "$gccpatch"; then echo "ROCKBOXDEV: applying gcc patch" - patch -p0 < "$dlwhere/$gccpatch" + # apply the patch and hope it runs well - don't be dependant on the + # exact gcc version, thus strip the gcc folder + (cd $builddir/gcc-$gccver && patch -p1 < "$dlwhere/$gccpatch") + if [ $? -gt 0 ]; then # check if the applied cleanly + echo "ROCKBOXDEV: failed to apply the gcc patch" + exit + fi fi echo "ROCKBOXDEV: mkdir build-binu-$1" -- cgit v1.2.3