Commit 86e24796 authored by ian@well-typed.com's avatar ian@well-typed.com

Fix the transformers-building code, and move it from validate to ghc.mk

This makes life easier, as ghc.mk has access to HADDOCK_DOCS
and DYNAMIC_BY_DEFAULT, so knows the right way to build it.
parent 38aeca27
......@@ -1305,6 +1305,30 @@ bootstrapping-files: $(libffi_HEADERS)
.DELETE_ON_ERROR:
# -----------------------------------------------------------------------------
ifeq "$(HADDOCK_DOCS)" "YES"
BINDIST_HADDOCK_FLAG = --with-haddock="$(BINDIST_PREFIX)/bin/haddock"
endif
ifeq "$(DYNAMIC_BY_DEFAULT)" "YES"
BINDIST_LIBRARY_FLAGS = --enable-shared --disable-library-vanilla
else
BINDIST_LIBRARY_FLAGS = --enable-library-vanilla --disable-shared
endif
BINDIST_LIBRARY_FLAGS += --disable-library-prof
.PHONY: validate_build_transformers
validate_build_transformers:
cd libraries/transformers && "$(BINDIST_PREFIX)/bin/ghc" --make Setup
cd libraries/transformers && ./Setup configure --with-ghc="$(BINDIST_PREFIX)/bin/ghc" $(BINDIST_HADDOCK_FLAG) $(BINDIST_LIBRARY_FLAGS) --global --builddir=dist-bindist --prefix="$(BINDIST_PREFIX)"
cd libraries/transformers && ./Setup build --builddir=dist-bindist
ifeq "$(HADDOCK_DOCS)" "YES"
cd libraries/transformers && ./Setup haddock --builddir=dist-bindist
endif
cd libraries/transformers && ./Setup install --builddir=dist-bindist
cd libraries/transformers && ./Setup clean --builddir=dist-bindist
cd libraries/transformers && rm -f Setup Setup.exe Setup.hi Setup.o
# -----------------------------------------------------------------------------
# Numbered phase targets
......
......@@ -115,28 +115,7 @@ if [ $speed != "FAST" ]; then
#
bindistdir="bindisttest/install dir"
# This is a hack to make
# HADDOCK_DOCS = NO
# work when validating.
if grep -q "^HADDOCK_DOCS.*=.*NO" mk/validate.mk
then
unset WITH_HADDOCK
DO_HADDOCK=NO
else
WITH_HADDOCK=--with-haddock="$thisdir/$bindistdir/bin/haddock"
DO_HADDOCK=YES
fi
cd libraries/transformers
"$thisdir/$bindistdir/bin/ghc" --make Setup
./Setup configure --with-ghc="$thisdir/$bindistdir/bin/ghc" ${WITH_HADDOCK+"$WITH_HADDOCK"} --global --builddir=dist-bindist --prefix="$thisdir/$bindistdir"
./Setup build --builddir=dist-bindist
[ "$DO_HADDOCK" = "YES" ] && ./Setup haddock --builddir=dist-bindist
./Setup install --builddir=dist-bindist
./Setup clean --builddir=dist-bindist
rm -f Setup Setup.exe Setup.hi Setup.o
cd $thisdir
$make validate_build_transformers BINDIST_PREFIX="$thisdir/$bindistdir"
fi
fi # testsuite-only
......
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