diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-05-22 08:33:51 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-05-22 08:33:51 +0000 |
| commit | 44fa40018be30ebb837ab6ad5766c57558e88cf8 (patch) | |
| tree | dda93c1c649ab8908810fd892962431ab545e7da /Makefile | |
| parent | acc388da8a787889597f34ccd704e24234763015 (diff) | |
| download | haskell-44fa40018be30ebb837ab6ad5766c57558e88cf8.tar.gz | |
Remove hacky on-demand building of libraries/*/ghc.mk, put it back in sh boot
Now that the clean rules don't require libraries/*/ghc.mk, we don't
have to build them on demand. And having them built on demand
introduced a failure mode (where some libraries have ghc.mk and some
don't).
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -43,17 +43,13 @@ endif include mk/custom-settings.mk -PACKAGE_MK=libraries/base/ghc.mk -$(PACKAGE_MK): - sh boot-pkgs - # No need to update makefiles for these targets: REALGOALS=$(filter-out bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show,$(MAKECMDGOALS)) # NB. not the same as saying '%: ...', which doesn't do the right thing: # it does nothing if we specify a target that already exists. .PHONY: $(REALGOALS) -$(REALGOALS) all: $(PACKAGE_MK) +$(REALGOALS) all: @echo "===--- updating makefiles phase 0" $(MAKE) -r --no-print-directory -f ghc.mk phase=0 just-makefiles ifneq "$(OMIT_PHASE_1)" "YES" @@ -83,7 +79,7 @@ clean distclean maintainer-clean: $(filter clean_%, $(MAKECMDGOALS)) : clean_% : $(MAKE) -r --no-print-directory -f ghc.mk $@ CLEANING=YES -bootstrapping-files show: $(PACKAGE_MK) +bootstrapping-files show: $(MAKE) -r --no-print-directory -f ghc.mk $@ ifeq "$(darwin_TARGET_OS)" "1" |