summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2009-09-08 15:19:08 +0000
committerSimon Marlow <marlowsd@gmail.com>2009-09-08 15:19:08 +0000
commit93cd31711eea3dc9aa2ef8995e8ba054dabd87f0 (patch)
treec65fde198db97373fefbfe222d9462b9b952cb12 /configure.ac
parent03bb97e0a29fe3f414c17e6b4074f2c9e8e8012e (diff)
downloadhaskell-93cd31711eea3dc9aa2ef8995e8ba054dabd87f0.tar.gz
add $(CONF_*_OPTS) for options that come from ./configure (fixes #3426)
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac12
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 8fa8829d61..5ba6707362 100644
--- a/configure.ac
+++ b/configure.ac
@@ -255,15 +255,15 @@ i386-apple-darwin|powerpc-apple-darwin)
soext='.dylib'
CFLAGS="$CFLAGS -m32"
LDFLAGS="$LDFLAGS -m32"
- SRC_CC_OPTS="$SRC_CC_OPTS -m32"
- SRC_LD_OPTS="$SRC_LD_OPTS -m32"
+ CONF_CC_OPTS="$CONF_CC_OPTS -m32"
+ CONF_LD_OPTS="$CONF_LD_OPTS -m32"
;;
x86_64-apple-darwin)
soext='.dylib'
CFLAGS="$CFLAGS -m64"
LDFLAGS="$LDFLAGS -m64"
- SRC_CC_OPTS="$SRC_CC_OPTS -m64"
- SRC_LD_OPTS="$SRC_LD_OPTS -m64"
+ CONF_CC_OPTS="$CONF_CC_OPTS -m64"
+ CONF_LD_OPTS="$CONF_LD_OPTS -m64"
;;
esac
@@ -525,8 +525,8 @@ FP_GCC_EXTRA_FLAGS
dnl ** figure out how to invoke cpp directly (gcc -E is no good)
AC_PROG_CPP
-AC_SUBST(SRC_CC_OPTS)
-AC_SUBST(SRC_LD_OPTS)
+AC_SUBST(CONF_CC_OPTS)
+AC_SUBST(CONF_LD_OPTS)
dnl ** figure out how to do context diffs
FP_PROG_CONTEXT_DIFF