Commit 8fbf686c authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Pass configure arguments to the library configure scripts

parent b1160a12
...@@ -31,6 +31,8 @@ if test ! -f mk/config.h.in; then ...@@ -31,6 +31,8 @@ if test ! -f mk/config.h.in; then
exit 1 exit 1
fi fi
AC_SUBST([CONFIGURE_ARGS], [$ac_configure_args])
FP_SETUP_PROJECT_VERSION FP_SETUP_PROJECT_VERSION
# Hmmm, we fix the RPM release number to 1 here... Is this convenient? # Hmmm, we fix the RPM release number to 1 here... Is this convenient?
......
...@@ -150,6 +150,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup ...@@ -150,6 +150,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
--with-ld=$(LD) \ --with-ld=$(LD) \
--datasubdir=ghc \ --datasubdir=ghc \
--haddock-args="--use-contents=../index.html --use-index=../doc-index.html" \ --haddock-args="--use-contents=../index.html --use-index=../doc-index.html" \
$(addprefix --configure-option=,$(CONFIGURE_ARGS)) \
--configure-option=--with-cc=$(CC) --configure-option=--with-cc=$(CC)
touch $@ touch $@
......
...@@ -1230,3 +1230,11 @@ WAY_o_HC_OPTS= ...@@ -1230,3 +1230,11 @@ WAY_o_HC_OPTS=
# GhcLibCppOpts += -DWORD_SIZE_IN_BITS=31 # GhcLibCppOpts += -DWORD_SIZE_IN_BITS=31
# SplitObjs=NO # SplitObjs=NO
################################################################################
#
# Library configure arguments
#
################################################################################
CONFIGURE_ARGS = @CONFIGURE_ARGS@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment