Commit 254baff2 authored by Mikael Ronstrom's avatar Mikael Ronstrom

Fixed some issues with build script and 64-bit handling,

couldn't use both --cpu=x86_64 and --64, also ignored
setting --32 and --64 on Linux
parent 6ba903ad
...@@ -598,11 +598,15 @@ parse_cpu_type() ...@@ -598,11 +598,15 @@ parse_cpu_type()
case "$cpu_type" in case "$cpu_type" in
x86 ) x86 )
cpu_type="x86" cpu_type="x86"
if test "x$m64" != "x" ; then
m64="no" m64="no"
fi
;; ;;
x86_64 ) x86_64 )
cpu_type="x86" cpu_type="x86"
if test "x$m64" != "x" ; then
m64="yes" m64="yes"
fi
;; ;;
itanium ) itanium )
cpu_type="itanium" cpu_type="itanium"
...@@ -703,17 +707,19 @@ parse_options() ...@@ -703,17 +707,19 @@ parse_options()
warning_mode="normal" warning_mode="normal"
;; ;;
--32) --32)
if test "x$m64" != "x" ; then if test "x$explicit_size_set" != "x" ; then
echo "Cannot set both --32 and --64" echo "Cannot set both --32 and --64"
exit 1 exit 1
fi fi
explicit_size_set="yes"
m64="no" m64="no"
;; ;;
--64) --64)
if test "x$m64" != "x" ; then if test "x$explicit_size_set" != "x" ; then
echo "Cannot set both --32 and --64" echo "Cannot set both --32 and --64"
exit 1 exit 1
fi fi
explicit_size_set="yes"
m64="yes" m64="yes"
;; ;;
--package=*) --package=*)
...@@ -856,8 +862,6 @@ set_cpu_base() ...@@ -856,8 +862,6 @@ set_cpu_base()
else else
m64="no" m64="no"
fi fi
else
m64="no"
fi fi
echo "Discovered CPU of type $cpu_base_type ($cpu_arg) on $os" echo "Discovered CPU of type $cpu_base_type ($cpu_arg) on $os"
if test "x$m64" = "xyes" ; then if test "x$m64" = "xyes" ; then
...@@ -1560,6 +1564,7 @@ base_configs= ...@@ -1560,6 +1564,7 @@ base_configs=
debug_flags= debug_flags=
cxxflags= cxxflags=
m64= m64=
explicit_size_set=
datadir= datadir=
commands= commands=
use_autotools= use_autotools=
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment