diff options
author | Jonas Häggqvist <rasher@rasher.dk> | 2006-11-22 09:07:45 +0000 |
---|---|---|
committer | Jonas Häggqvist <rasher@rasher.dk> | 2006-11-22 09:07:45 +0000 |
commit | ee61057ceabd8b2b69a5e733d27caae2adece6cf (patch) | |
tree | a684956e555c0670b3a29068568792ffbb0ddee2 /tools/rockboxdev.sh | |
parent | 43e2c01065df95bac37e2efd15d61c86b736e1c0 (diff) | |
download | rockbox-ee61057ceabd8b2b69a5e733d27caae2adece6cf.tar.gz rockbox-ee61057ceabd8b2b69a5e733d27caae2adece6cf.zip |
Use gmake rather than make, if available. Patch FS#6340 by Lutz Böhne
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11571 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/rockboxdev.sh')
-rwxr-xr-x | tools/rockboxdev.sh | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh index 0fe4cbe10e..debf12cc34 100755 --- a/tools/rockboxdev.sh +++ b/tools/rockboxdev.sh | |||
@@ -14,8 +14,21 @@ prefix="/usr/local" | |||
14 | # must not exist before this script is invoked (as a security measure). | 14 | # must not exist before this script is invoked (as a security measure). |
15 | builddir="$HOME/build-rbdev" | 15 | builddir="$HOME/build-rbdev" |
16 | 16 | ||
17 | # This script needs to use GNU Make. On Linux systems, GNU Make is invoked | ||
18 | # by running the "make" command, on most BSD systems, GNU Make is invoked | ||
19 | # by running the "gmake" command. Set the "make" variable accordingly. | ||
20 | if [ -n "`which gmake`" ]; then | ||
21 | make="gmake" | ||
22 | else | ||
23 | make="make" | ||
24 | fi | ||
25 | |||
26 | # If detection fails, override the value of make manually: | ||
27 | # make="make" | ||
28 | |||
17 | ############################################################################## | 29 | ############################################################################## |
18 | 30 | ||
31 | |||
19 | findtool(){ | 32 | findtool(){ |
20 | file="$1" | 33 | file="$1" |
21 | 34 | ||
@@ -201,9 +214,9 @@ cd build-binu | |||
201 | echo "ROCKBOXDEV: binutils/configure" | 214 | echo "ROCKBOXDEV: binutils/configure" |
202 | ../binutils-$binutils/configure --target=$target --prefix=$prefix/$target | 215 | ../binutils-$binutils/configure --target=$target --prefix=$prefix/$target |
203 | echo "ROCKBOXDEV: binutils/make" | 216 | echo "ROCKBOXDEV: binutils/make" |
204 | make | 217 | $make |
205 | echo "ROCKBOXDEV: binutils/make install to $prefix/$target" | 218 | echo "ROCKBOXDEV: binutils/make install to $prefix/$target" |
206 | make install | 219 | $make install |
207 | cd .. # get out of build-binu | 220 | cd .. # get out of build-binu |
208 | PATH="${PATH}:$bindir" | 221 | PATH="${PATH}:$bindir" |
209 | SHELL=/bin/sh # seems to be needed by the gcc build in some cases | 222 | SHELL=/bin/sh # seems to be needed by the gcc build in some cases |
@@ -215,9 +228,9 @@ cd build-gcc | |||
215 | echo "ROCKBOXDEV: gcc/configure" | 228 | echo "ROCKBOXDEV: gcc/configure" |
216 | ../gcc-$gccver/configure --target=$target --prefix=$prefix/$target --enable-languages=c | 229 | ../gcc-$gccver/configure --target=$target --prefix=$prefix/$target --enable-languages=c |
217 | echo "ROCKBOXDEV: gcc/make" | 230 | echo "ROCKBOXDEV: gcc/make" |
218 | make | 231 | $make |
219 | echo "ROCKBOXDEV: gcc/make install to $prefix/$target" | 232 | echo "ROCKBOXDEV: gcc/make install to $prefix/$target" |
220 | make install | 233 | $make install |
221 | cd .. # get out of build-gcc | 234 | cd .. # get out of build-gcc |
222 | cd .. # get out of $builddir | 235 | cd .. # get out of $builddir |
223 | 236 | ||