diff options
Diffstat (limited to 'tools/rockboxdev.sh')
-rwxr-xr-x | tools/rockboxdev.sh | 13 |
1 files changed, 9 insertions, 4 deletions
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 | |||
194 | [Ee]) | 194 | [Ee]) |
195 | target="arm-elf-eabi" | 195 | target="arm-elf-eabi" |
196 | gccpatch="rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-4.4.2_1.diff" | 196 | gccpatch="rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-4.4.2_1.diff" |
197 | binutilsconf="--disable-werror" | 197 | gccver="4.4.3" |
198 | gccver="4.4.2" | ||
199 | # needed to build a bare-metal gcc-4.4.2 | 198 | # needed to build a bare-metal gcc-4.4.2 |
200 | gcctarget="all-gcc all-target-libgcc" | 199 | gcctarget="all-gcc all-target-libgcc" |
201 | gccinstalltarget="install-gcc install-target-libgcc" | 200 | gccinstalltarget="install-gcc install-target-libgcc" |
202 | binutils="2.20" | 201 | binutils="2.20.1" |
203 | ;; | 202 | ;; |
204 | [Ii]) | 203 | [Ii]) |
205 | target="mipsel-elf" | 204 | target="mipsel-elf" |
@@ -299,7 +298,13 @@ bunzip2 < $dlwhere/gcc-core-$gccver.tar.bz2 | tar xf - | |||
299 | 298 | ||
300 | if test -n "$gccpatch"; then | 299 | if test -n "$gccpatch"; then |
301 | echo "ROCKBOXDEV: applying gcc patch" | 300 | echo "ROCKBOXDEV: applying gcc patch" |
302 | patch -p0 < "$dlwhere/$gccpatch" | 301 | # apply the patch and hope it runs well - don't be dependant on the |
302 | # exact gcc version, thus strip the gcc folder | ||
303 | (cd $builddir/gcc-$gccver && patch -p1 < "$dlwhere/$gccpatch") | ||
304 | if [ $? -gt 0 ]; then # check if the applied cleanly | ||
305 | echo "ROCKBOXDEV: failed to apply the gcc patch" | ||
306 | exit | ||
307 | fi | ||
303 | fi | 308 | fi |
304 | 309 | ||
305 | echo "ROCKBOXDEV: mkdir build-binu-$1" | 310 | echo "ROCKBOXDEV: mkdir build-binu-$1" |