diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-02-21 11:03:49 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-02-21 11:03:49 +0100 |
| commit | 51ec0c28aabfde446b23b9240fc3b8cff05c565b (patch) | |
| tree | 3a38d0076b392f6b34b343ea3c323ebab71226b2 /BUILD/build_mccge.sh | |
| parent | 1b6cdc26d9952ad4840078d734ca91a053dacc79 (diff) | |
| download | mariadb-git-51ec0c28aabfde446b23b9240fc3b8cff05c565b.tar.gz | |
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
Diffstat (limited to 'BUILD/build_mccge.sh')
| -rwxr-xr-x | BUILD/build_mccge.sh | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/BUILD/build_mccge.sh b/BUILD/build_mccge.sh index cbc2e895815..04000845b38 100755 --- a/BUILD/build_mccge.sh +++ b/BUILD/build_mccge.sh @@ -598,11 +598,15 @@ parse_cpu_type() case "$cpu_type" in x86 ) cpu_type="x86" - m64="no" + if test "x$m64" != "x" ; then + m64="no" + fi ;; x86_64 ) cpu_type="x86" - m64="yes" + if test "x$m64" != "x" ; then + m64="yes" + fi ;; itanium ) cpu_type="itanium" @@ -703,17 +707,19 @@ parse_options() warning_mode="normal" ;; --32) - if test "x$m64" != "x" ; then + if test "x$explicit_size_set" != "x" ; then echo "Cannot set both --32 and --64" exit 1 fi + explicit_size_set="yes" m64="no" ;; --64) - if test "x$m64" != "x" ; then + if test "x$explicit_size_set" != "x" ; then echo "Cannot set both --32 and --64" exit 1 fi + explicit_size_set="yes" m64="yes" ;; --package=*) @@ -856,8 +862,6 @@ set_cpu_base() else m64="no" fi - else - m64="no" fi echo "Discovered CPU of type $cpu_base_type ($cpu_arg) on $os" if test "x$m64" = "xyes" ; then @@ -1560,6 +1564,7 @@ base_configs= debug_flags= cxxflags= m64= +explicit_size_set= datadir= commands= use_autotools= |