Commit dce65c10 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Change how the libraries Makefile adds --configure-option= flags; fixes #1431

We now assume that each configure option is quoted with '', and thus
replace " '" with " --configure-option='".
parent 5abfec6d
......@@ -195,6 +195,12 @@ else
libsubdir = $$compiler/lib/$$pkgid
endif
# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
# being no 's inside the values.
FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
$(space)--configure-option=',\
$(space)$(CONFIGURE_ARGS))
$(foreach SUBDIR,$(SUBDIRS), \
stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
......@@ -211,7 +217,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
--datasubdir=ghc \
--haddock-args="--use-contents=../index.html \
--use-index=../doc-index.html" \
$(addprefix --configure-option=,$(CONFIGURE_ARGS)) \
$(FLAGGED_CONFIGURE_ARGS) \
--configure-option=--with-cc=$(CC) ) \
&& touch $@ || touch $*/unbuildable
# We don't touch $@ if configure failed as we would prefer to try
......
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