aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2011-03-17 10:12:54 +0100
committerSverker Eriksson <[email protected]>2011-03-17 10:12:54 +0100
commitb3c59c7ba43cf2fdaf0af9e4da189d68df62fd33 (patch)
tree588305b351254588552b78f9d911ecf86a22ada2
parentf861b4fdb3fd39e35f2951c53a73b30a98c7f973 (diff)
downloadotp-b3c59c7ba43cf2fdaf0af9e4da189d68df62fd33.tar.gz
otp-b3c59c7ba43cf2fdaf0af9e4da189d68df62fd33.tar.bz2
otp-b3c59c7ba43cf2fdaf0af9e4da189d68df62fd33.zip
Prevent configuration of hipe and halfword emulator together
If not explicitly enabled, hipe is auto-disabled for halfword emulator. Configuration fails if both are explicitly enabled.
-rw-r--r--erts/configure.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/erts/configure.in b/erts/configure.in
index 627f734409..941386e45d 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -*-m4-*-
dnl %CopyrightBegin%
dnl
-dnl Copyright Ericsson AB 1997-2010. All Rights Reserved.
+dnl Copyright Ericsson AB 1997-2011. All Rights Reserved.
dnl
dnl The contents of this file are subject to the Erlang Public License,
dnl Version 1.1, (the "License"); you may not use this file except in
@@ -2399,6 +2399,12 @@ if test "$cross_compiling" != "yes" && test X${enable_hipe} != Xno; then
if test -z "$M4"; then
enable_hipe=no
AC_MSG_NOTICE([HiPE disabled as no valid m4 is found in PATH])
+ elif test "$enable_halfword_emulator" = "yes"; then
+ if test X${enable_hipe} = Xyes; then
+ AC_MSG_ERROR([HiPE can not be combined with halfword emulator (yet)])
+ else
+ AC_MSG_NOTICE([HiPE auto-disabled on halfword emulator])
+ fi
else
case "$ARCH-$OPSYS" in
x86-linux|amd64-linux|x86-darwin*|amd64-darwin*|ppc-linux|ppc-darwin|arm-linux|amd64-freebsd|x86-freebsd|x86-sol2|amd64-sol2|ultrasparc-linux)