aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2013-12-03 12:27:01 +0100
committerBjörn-Egil Dahlberg <[email protected]>2013-12-03 12:27:01 +0100
commitf523c28b28ba1b184e48c3741937ece19e66c5f0 (patch)
tree792f5ae13fd6b806be8ca43b8e309d2243078730 /erts
parent6e87e21a3c4382d246a8b70cc10958799a69492a (diff)
parent60e7db6396a0966cfaea83eba96c0f13e4768aef (diff)
downloadotp-f523c28b28ba1b184e48c3741937ece19e66c5f0.tar.gz
otp-f523c28b28ba1b184e48c3741937ece19e66c5f0.tar.bz2
otp-f523c28b28ba1b184e48c3741937ece19e66c5f0.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/configure.in35
1 files changed, 11 insertions, 24 deletions
diff --git a/erts/configure.in b/erts/configure.in
index 9d67837ff0..3b4c46d4a5 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
AC_ARG_ENABLE(static-nifs,