Commit 5327cf489fcaefd0b64dbd13e6b26e91054a701c
1 parent
e995898b
better target_list logic
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1210 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
13 additions
and
3 deletions
configure
| @@ -27,7 +27,7 @@ ar="ar" | @@ -27,7 +27,7 @@ ar="ar" | ||
| 27 | make="make" | 27 | make="make" |
| 28 | strip="strip" | 28 | strip="strip" |
| 29 | cpu=`uname -m` | 29 | cpu=`uname -m` |
| 30 | -target_list="i386-user i386 i386-softmmu arm-user armeb-user sparc-user ppc-user ppc-softmmu sparc-softmmu x86_64-softmmu" | 30 | +target_list="" |
| 31 | case "$cpu" in | 31 | case "$cpu" in |
| 32 | i386|i486|i586|i686|i86pc|BePC) | 32 | i386|i486|i586|i686|i86pc|BePC) |
| 33 | cpu="i386" | 33 | cpu="i386" |
| @@ -80,6 +80,7 @@ oss="no" | @@ -80,6 +80,7 @@ oss="no" | ||
| 80 | fmod="no" | 80 | fmod="no" |
| 81 | fmod_lib="" | 81 | fmod_lib="" |
| 82 | fmod_inc="" | 82 | fmod_inc="" |
| 83 | +linux="no" | ||
| 83 | 84 | ||
| 84 | # OS specific | 85 | # OS specific |
| 85 | targetos=`uname -s` | 86 | targetos=`uname -s` |
| @@ -105,6 +106,7 @@ darwin="yes" | @@ -105,6 +106,7 @@ darwin="yes" | ||
| 105 | ;; | 106 | ;; |
| 106 | *) | 107 | *) |
| 107 | oss="yes" | 108 | oss="yes" |
| 109 | +linux="yes" | ||
| 108 | ;; | 110 | ;; |
| 109 | esac | 111 | esac |
| 110 | 112 | ||
| @@ -112,7 +114,6 @@ if [ "$bsd" = "yes" ] ; then | @@ -112,7 +114,6 @@ if [ "$bsd" = "yes" ] ; then | ||
| 112 | if [ ! "$darwin" = "yes" ] ; then | 114 | if [ ! "$darwin" = "yes" ] ; then |
| 113 | make="gmake" | 115 | make="gmake" |
| 114 | fi | 116 | fi |
| 115 | - target_list="i386-softmmu ppc-softmmu sparc-softmmu" | ||
| 116 | fi | 117 | fi |
| 117 | 118 | ||
| 118 | # find source path | 119 | # find source path |
| @@ -181,12 +182,21 @@ ar="${cross_prefix}${ar}" | @@ -181,12 +182,21 @@ ar="${cross_prefix}${ar}" | ||
| 181 | strip="${cross_prefix}${strip}" | 182 | strip="${cross_prefix}${strip}" |
| 182 | 183 | ||
| 183 | if test "$mingw32" = "yes" ; then | 184 | if test "$mingw32" = "yes" ; then |
| 184 | - target_list="i386-softmmu ppc-softmmu sparc-softmmu" | 185 | + linux="no" |
| 185 | EXESUF=".exe" | 186 | EXESUF=".exe" |
| 186 | gdbstub="no" | 187 | gdbstub="no" |
| 187 | oss="no" | 188 | oss="no" |
| 188 | fi | 189 | fi |
| 189 | 190 | ||
| 191 | +if test -z "$target_list" ; then | ||
| 192 | +# these targets are portable | ||
| 193 | + target_list="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu" | ||
| 194 | +# the following are Linux specific | ||
| 195 | + if [ "$linux" = "yes" ] ; then | ||
| 196 | + target_list="i386-user i386 arm-user armeb-user sparc-user ppc-user $target_list" | ||
| 197 | + fi | ||
| 198 | +fi | ||
| 199 | + | ||
| 190 | if test -z "$cross_prefix" ; then | 200 | if test -z "$cross_prefix" ; then |
| 191 | 201 | ||
| 192 | # --- | 202 | # --- |