aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2013-12-03 12:26:40 +0100
committerBjörn-Egil Dahlberg <[email protected]>2013-12-03 12:26:40 +0100
commit60e7db6396a0966cfaea83eba96c0f13e4768aef (patch)
tree8ad4bedf7d81a85992ea7cc5a2c3b256344fd172
parent1af2b59ab5102e52ed55cc3afed561daa08eac17 (diff)
parent8f25405251c694f0660d5d7b2b24de1218888439 (diff)
downloadotp-60e7db6396a0966cfaea83eba96c0f13e4768aef.tar.gz
otp-60e7db6396a0966cfaea83eba96c0f13e4768aef.tar.bz2
otp-60e7db6396a0966cfaea83eba96c0f13e4768aef.zip
Merge branch 'egil/fix-darwin-64-configure-default/OTP-11521' into maint
* egil/fix-darwin-64-configure-default/OTP-11521: erts: Let cc determine default wordsize for darwin build
-rw-r--r--erts/configure.in35
1 files changed, 11 insertions, 24 deletions
diff --git a/erts/configure.in b/erts/configure.in
index ba80fdbbbe..bad748d8fe 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -393,30 +393,17 @@ if test X${enable_darwin_64bit} = Xyes -o X${enable_m64_build} = Xyes; then
;;
esac
else
- case $host_os in
- darwin*)
- case $CFLAGS in
- *-m32*)
- ;;
- *)
- CFLAGS="-m32 $CFLAGS"
- ;;
- esac
- ;;
- *)
- if test X${enable_m32_build} = Xyes;
- then
- enable_hipe=no;
- case $CFLAGS in
- *-m32*)
- ;;
- *)
- CFLAGS="-m32 $CFLAGS"
- ;;
- esac ;
- fi
- ;;
- esac
+ if test X${enable_m32_build} = Xyes;
+ then
+ enable_hipe=no;
+ case $CFLAGS in
+ *-m32*)
+ ;;
+ *)
+ CFLAGS="-m32 $CFLAGS"
+ ;;
+ esac ;
+ fi
fi