Commit aecf4a5f authored by thomie's avatar thomie

Build system: don't create mk/are-validating.mk

A `make` build after running `./validate` earlier should use the normal
mk/build.mk settings, without having to manually delete the leftover
file mk/are-validating or run `make clean` first.

Reviewed by: austin

Differential Revision: https://phabricator.haskell.org/D1307
parent 620fc6f9
...@@ -130,7 +130,6 @@ _darcs/ ...@@ -130,7 +130,6 @@ _darcs/
/libraries/plus.gif /libraries/plus.gif
/libraries/synopsis.png /libraries/synopsis.png
/libraries/stamp/ /libraries/stamp/
/mk/are-validating.mk
/mk/build.mk /mk/build.mk
/mk/config.h /mk/config.h
/mk/config.h.in /mk/config.h.in
......
...@@ -1324,9 +1324,6 @@ clean_bindistprep: ...@@ -1324,9 +1324,6 @@ clean_bindistprep:
$(call removeTrees,bindistprep/) $(call removeTrees,bindistprep/)
distclean : clean distclean : clean
# Clean the files that ./validate creates.
$(call removeFiles,mk/are-validating.mk)
# Clean the files that we ask ./configure to create. # Clean the files that we ask ./configure to create.
$(call removeFiles,mk/config.mk) $(call removeFiles,mk/config.mk)
$(call removeFiles,mk/install.mk) $(call removeFiles,mk/install.mk)
......
-include mk/are-validating.mk
ifeq "$(Validating)" "YES" ifeq "$(Validating)" "YES"
include mk/flavours/validate.mk include mk/flavours/validate.mk
-include mk/validate.mk -include mk/validate.mk
......
...@@ -174,9 +174,7 @@ fi ...@@ -174,9 +174,7 @@ fi
thisdir=`utils/ghc-pwd/dist-boot/ghc-pwd` thisdir=`utils/ghc-pwd/dist-boot/ghc-pwd`
echo "Validating=YES" > mk/are-validating.mk make_settings="Validating=YES ValidateSpeed=$speed ValidateHpc=$hpc"
echo "ValidateSpeed=$speed" >> mk/are-validating.mk
echo "ValidateHpc=$hpc" >> mk/are-validating.mk
# Note [Default build system verbosity]. # Note [Default build system verbosity].
# #
...@@ -190,16 +188,14 @@ echo "ValidateHpc=$hpc" >> mk/are-validating.mk ...@@ -190,16 +188,14 @@ echo "ValidateHpc=$hpc" >> mk/are-validating.mk
# `make -s`, when user explicitly asks for it with `./validate --quiet`. # `make -s`, when user explicitly asks for it with `./validate --quiet`.
if [ $be_quiet -eq 1 ]; then if [ $be_quiet -eq 1 ]; then
# See Note [Default build system verbosity]. # See Note [Default build system verbosity].
echo "V=0" >> mk/are-validating.mk # Less gunk make_settings="$make_settings V=0"
fi fi
if [ $use_dph -eq 1 ]; then if [ $use_dph -eq 1 ]; then
echo "BUILD_DPH=YES" >> mk/are-validating.mk make_settings="$make_settings BUILD_DPH=YES"
else
echo "BUILD_DPH=NO" >> mk/are-validating.mk
fi fi
$make -j$threads $make -j$threads $make_settings
# For a "debug make", add "--debug=b --debug=m" # For a "debug make", add "--debug=b --debug=m"
check_packages post-build check_packages post-build
...@@ -209,8 +205,8 @@ check_packages post-build ...@@ -209,8 +205,8 @@ check_packages post-build
if [ $speed != "FAST" ]; then if [ $speed != "FAST" ]; then
$make binary-dist-prep $make binary-dist-prep $make_settings
$make test_bindist TEST_PREP=YES $make test_bindist TEST_PREP=YES $make_settings
# #
# Install the xhtml package into the bindist. # Install the xhtml package into the bindist.
...@@ -221,7 +217,7 @@ if [ $speed != "FAST" ]; then ...@@ -221,7 +217,7 @@ if [ $speed != "FAST" ]; then
check_packages post-install check_packages post-install
$make validate_build_xhtml BINDIST_PREFIX="$thisdir/$bindistdir" $make validate_build_xhtml BINDIST_PREFIX="$thisdir/$bindistdir" $make_settings
check_packages post-xhtml check_packages post-xhtml
fi fi
......
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