diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-06-22 16:09:51 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-06-22 16:09:51 +0000 |
| commit | dce65c102b136ee9eb57fadf4cc3fd7a8931d074 (patch) | |
| tree | 3691d5dd75b5da48667453c08c9ed20b5375ccf8 | |
| parent | 5abfec6de133babadc55c86a2c7200d48f686f59 (diff) | |
| download | haskell-dce65c102b136ee9eb57fadf4cc3fd7a8931d074.tar.gz | |
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='".
| -rw-r--r-- | libraries/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libraries/Makefile b/libraries/Makefile index 342364400e..1fef7e3893 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -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 |