diff options
author | Nils Wallménius <nils@rockbox.org> | 2011-05-27 15:13:29 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2011-05-27 15:13:29 +0000 |
commit | ee7cbf6d4a2eb3d48a18c96eeb038c3a5184debc (patch) | |
tree | 50509f27906af7c3c215d417c86d0869dd4b5165 | |
parent | 0497adffcf18e700215ce47f86eca0307a60bffc (diff) | |
download | rockbox-ee7cbf6d4a2eb3d48a18c96eeb038c3a5184debc.tar.gz rockbox-ee7cbf6d4a2eb3d48a18c96eeb038c3a5184debc.zip |
FS#12121 by Sean Bartell, disables -Werror on binutils builds to fix them when using gcc 4.6.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29928 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-x | tools/rockboxdev.sh | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh index beb6c4e299..afa0296ca7 100755 --- a/tools/rockboxdev.sh +++ b/tools/rockboxdev.sh | |||
@@ -276,7 +276,7 @@ do | |||
276 | echo "" | 276 | echo "" |
277 | case $arch in | 277 | case $arch in |
278 | [Ss]) | 278 | [Ss]) |
279 | build "binutils" "sh-elf" "2.16.1" | 279 | build "binutils" "sh-elf" "2.16.1" "" "--disable-werror" |
280 | build "gcc" "sh-elf" "4.0.3" "gcc-4.0.3-rockbox-1.diff" | 280 | build "gcc" "sh-elf" "4.0.3" "gcc-4.0.3-rockbox-1.diff" |
281 | ;; | 281 | ;; |
282 | 282 | ||
@@ -290,18 +290,12 @@ do | |||
290 | ;; | 290 | ;; |
291 | 291 | ||
292 | [Mm]) | 292 | [Mm]) |
293 | binopts="" | 293 | build "binutils" "m68k-elf" "2.20.1" "" "--disable-werror" |
294 | case $system in | ||
295 | Darwin) | ||
296 | binopts="--disable-werror" | ||
297 | ;; | ||
298 | esac | ||
299 | build "binutils" "m68k-elf" "2.20.1" "" "$binopts" | ||
300 | build "gcc" "m68k-elf" "4.5.2" "" "--with-arch=cf" "gmp mpfr mpc" | 294 | build "gcc" "m68k-elf" "4.5.2" "" "--with-arch=cf" "gmp mpfr mpc" |
301 | ;; | 295 | ;; |
302 | 296 | ||
303 | [Aa]) | 297 | [Aa]) |
304 | build "binutils" "arm-elf" "2.16.1" | 298 | build "binutils" "arm-elf" "2.16.1" "" "--disable-werror" |
305 | build "gcc" "arm-elf" "4.0.3" "rockbox-multilibs-arm-elf-gcc-4.0.3_3.diff" | 299 | build "gcc" "arm-elf" "4.0.3" "rockbox-multilibs-arm-elf-gcc-4.0.3_3.diff" |
306 | ;; | 300 | ;; |
307 | 301 | ||
@@ -310,11 +304,11 @@ do | |||
310 | gccopts="" | 304 | gccopts="" |
311 | case $system in | 305 | case $system in |
312 | Darwin) | 306 | Darwin) |
313 | binopts="--disable-nls --disable-werror" | 307 | binopts="--disable-nls" |
314 | gccopts="--disable-nls" | 308 | gccopts="--disable-nls" |
315 | ;; | 309 | ;; |
316 | esac | 310 | esac |
317 | build "binutils" "arm-elf-eabi" "2.20.1" "binutils-2.20.1-ld-thumb-interwork-long-call.diff" "$binopts" | 311 | build "binutils" "arm-elf-eabi" "2.20.1" "binutils-2.20.1-ld-thumb-interwork-long-call.diff" "$binopts --disable-werror" |
318 | build "gcc" "arm-elf-eabi" "4.4.4" "rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-4.4.2_1.diff" "$gccopts" "gmp mpfr" | 312 | build "gcc" "arm-elf-eabi" "4.4.4" "rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-4.4.2_1.diff" "$gccopts" "gmp mpfr" |
319 | ;; | 313 | ;; |
320 | 314 | ||