diff options
author | Björn Stenberg <bjorn@haxx.se> | 2010-06-06 00:27:52 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2010-06-06 00:27:52 +0000 |
commit | 5e412b37578c8766514560ea40f043dfe87d4335 (patch) | |
tree | 7b6bae538be8de2e7859ae19c2a295d9707c5971 | |
parent | 46f267c0e15712e18ec4a9343cf93557ef7d1fa9 (diff) | |
download | rockbox-5e412b37578c8766514560ea40f043dfe87d4335.tar.gz rockbox-5e412b37578c8766514560ea40f043dfe87d4335.zip |
Corrected the GMP & MPFR workaround.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26606 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-x | tools/rockboxdev.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh index 49f9abb3c0..a4deecbb66 100755 --- a/tools/rockboxdev.sh +++ b/tools/rockboxdev.sh | |||
@@ -159,19 +159,25 @@ build() { | |||
159 | 159 | ||
160 | # kludge to avoid having to install GMP and MPFR for new gcc | 160 | # kludge to avoid having to install GMP and MPFR for new gcc |
161 | if test -n "$needs_gmp"; then | 161 | if test -n "$needs_gmp"; then |
162 | cd "gcc-$version" | ||
162 | if test ! -d gmp; then | 163 | if test ! -d gmp; then |
163 | echo "ROCKBOXDEV: Getting GMP" | 164 | echo "ROCKBOXDEV: Getting GMP" |
164 | getfile "gmp-5.0.1.tar.bz2" "$GNU_MIRROR/gmp" | 165 | if test ! -f $dlwhere/gmp-5.0.1.tar.bz2; then |
166 | getfile "gmp-5.0.1.tar.bz2" "$GNU_MIRROR/gmp" | ||
167 | fi | ||
165 | tar xjf $dlwhere/gmp-5.0.1.tar.bz2 | 168 | tar xjf $dlwhere/gmp-5.0.1.tar.bz2 |
166 | ln -s gmp-5.0.1.tar.bz2 gmp | 169 | ln -s gmp-5.0.1 gmp |
167 | fi | 170 | fi |
168 | 171 | ||
169 | if test ! -d mpfr; then | 172 | if test ! -d mpfr; then |
170 | echo "ROCKBOXDEV: Getting MPFR" | 173 | echo "ROCKBOXDEV: Getting MPFR" |
171 | getfile "mpfr-2.4.2.tar.bz2" "$GNU_MIRROR/mpfr" | 174 | if test ! -f $dlwhere/mpfr-2.4.2.tar.bz2; then |
175 | getfile "mpfr-2.4.2.tar.bz2" "$GNU_MIRROR/mpfr" | ||
176 | fi | ||
172 | tar xjf $dlwhere/mpfr-2.4.2.tar.bz2 | 177 | tar xjf $dlwhere/mpfr-2.4.2.tar.bz2 |
173 | ln -s mpfr-2.4.2 mpfr | 178 | ln -s mpfr-2.4.2 mpfr |
174 | fi | 179 | fi |
180 | cd $builddir | ||
175 | fi | 181 | fi |
176 | 182 | ||
177 | echo "ROCKBOXDEV: mkdir build-$toolname" | 183 | echo "ROCKBOXDEV: mkdir build-$toolname" |