diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-12 22:24:32 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-12 22:24:32 -0400 |
commit | ab1cf209eca379bc679a73b397c6b348be5a6862 (patch) | |
tree | cd2aba471e2f70962374abfc4b3a3d02608a706d /tools/rockboxdev.sh | |
parent | 980124ec7348219962ff17ad0d37c4033d552ace (diff) | |
download | rockbox-ab1cf209eca379bc679a73b397c6b348be5a6862.tar.gz rockbox-ab1cf209eca379bc679a73b397c6b348be5a6862.zip |
build: We don't want '-r' in MAKEFLAGS for toolchain builds.
Change-Id: Id1a96fb2274572ae7520a146b13f044f68e0c3aa
Diffstat (limited to 'tools/rockboxdev.sh')
-rwxr-xr-x | tools/rockboxdev.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh index cd653977ee..4123790ce6 100755 --- a/tools/rockboxdev.sh +++ b/tools/rockboxdev.sh | |||
@@ -466,11 +466,11 @@ build_ctng() { | |||
466 | 466 | ||
467 | dlurl="http://www.rockbox.org/gcc/$ctng_target" | 467 | dlurl="http://www.rockbox.org/gcc/$ctng_target" |
468 | 468 | ||
469 | # download | 469 | # download |
470 | getfile "ct-ng-config" "$dlurl" | 470 | getfile "ct-ng-config" "$dlurl" |
471 | 471 | ||
472 | test -n "$extra" && getfile "$extra" "$dlurl" | 472 | test -n "$extra" && getfile "$extra" "$dlurl" |
473 | 473 | ||
474 | # create build directory | 474 | # create build directory |
475 | if test -d $builddir; then | 475 | if test -d $builddir; then |
476 | if test ! -w $builddir; then | 476 | if test ! -w $builddir; then |
@@ -497,7 +497,7 @@ build_ctng() { | |||
497 | tar xf "$dlwhere/$extra" -C "$prefix/$tc_arch-$ctng_target-$tc_host/$sysroot" | 497 | tar xf "$dlwhere/$extra" -C "$prefix/$tc_arch-$ctng_target-$tc_host/$sysroot" |
498 | fi | 498 | fi |
499 | fi | 499 | fi |
500 | 500 | ||
501 | # cleanup | 501 | # cleanup |
502 | cd $builddir | 502 | cd $builddir |
503 | rm -rf $builddir/build-$ctng_target | 503 | rm -rf $builddir/build-$ctng_target |
@@ -721,6 +721,7 @@ PATH="$prefix/bin:${PATH}" | |||
721 | 721 | ||
722 | for arch in $selarch | 722 | for arch in $selarch |
723 | do | 723 | do |
724 | export MAKEFLAGS=`echo $MAKEFLAGS| sed 's/ -r / /'` # We don't want -r | ||
724 | echo "" | 725 | echo "" |
725 | case $arch in | 726 | case $arch in |
726 | [Ss]) | 727 | [Ss]) |
@@ -797,7 +798,7 @@ do | |||
797 | prefix="/usr" buildtool "alsa-lib" "$alsalib_ver" \ | 798 | prefix="/usr" buildtool "alsa-lib" "$alsalib_ver" \ |
798 | "--host=$target --disable-python" "" "install DESTDIR=$prefix/$target/sysroot" | 799 | "--host=$target --disable-python" "" "install DESTDIR=$prefix/$target/sysroot" |
799 | ;; | 800 | ;; |
800 | [yy]) | 801 | [Yy]) |
801 | # IMPORTANT NOTE | 802 | # IMPORTANT NOTE |
802 | # This toolchain must support several targets and thus must support | 803 | # This toolchain must support several targets and thus must support |
803 | # the oldest possible configuration. | 804 | # the oldest possible configuration. |