summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-06-05 17:09:04 +0000
committerThomas Martitz <kugel@rockbox.org>2010-06-05 17:09:04 +0000
commitefbc5df5f7b0b5a79c0e9883e4507d8fe0ce7cf5 (patch)
treeb89c770be37c43f2f692f1ede9567e6ce7cd6d85
parent6ea6dce4b5618806bd5e766f870531fafade3721 (diff)
downloadrockbox-efbc5df5f7b0b5a79c0e9883e4507d8fe0ce7cf5.tar.gz
rockbox-efbc5df5f7b0b5a79c0e9883e4507d8fe0ce7cf5.zip
Look for CROSS_COMPILE when building the simulator.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26589 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-xtools/configure13
1 files changed, 10 insertions, 3 deletions
diff --git a/tools/configure b/tools/configure
index 505598fba1..7c41a0b182 100755
--- a/tools/configure
+++ b/tools/configure
@@ -97,7 +97,7 @@ findsdl(){
97simcc () { 97simcc () {
98 98
99 # default tool setup for native building 99 # default tool setup for native building
100 prefixtools "" 100 prefixtools "$CROSS_COMPILE"
101 101
102 simver=sdl 102 simver=sdl
103 winbuild="$crosscompile" 103 winbuild="$crosscompile"
@@ -204,7 +204,10 @@ EOF
204 204
205 $CC -o $tmpdir/conftest-$id $tmpdir/conftest-$id.c 2>/dev/null 205 $CC -o $tmpdir/conftest-$id $tmpdir/conftest-$id.c 2>/dev/null
206 206
207 if test `$tmpdir/conftest-$id 2>/dev/null` -gt "1"; then 207 # when cross compiling, the endianess cannot be detected because the above program doesn't run
208 # on the local machine. assume little endian but print a warning
209 endian=`$tmpdir/conftest-$id 2> /dev/null`
210 if [ "$endian" != "" ] && [ $endian -gt "1" ]; then
208 # big endian 211 # big endian
209 endian="big" 212 endian="big"
210 else 213 else
@@ -212,6 +215,10 @@ EOF
212 endian="little" 215 endian="little"
213 fi 216 fi
214 217
218 if [ "$CROSS_COMPILE" != "" ]; then
219 echo "WARNING: Cross Compiling, cannot detect endianess. Assuming little endian!"
220 fi
221
215 if [ $1 = "sdl" ]; then 222 if [ $1 = "sdl" ]; then
216 echo "Simulator environment deemed $endian endian" 223 echo "Simulator environment deemed $endian endian"
217 elif [ $1 = "checkwps" ]; then 224 elif [ $1 = "checkwps" ]; then
@@ -2841,7 +2848,7 @@ else
2841 fi 2848 fi
2842 2849
2843 case $prefix in 2850 case $prefix in
2844 "") 2851 ""|"$CROSS_COMPILE")
2845 # simulator 2852 # simulator
2846 ;; 2853 ;;
2847 i586-mingw32msvc-) 2854 i586-mingw32msvc-)