Skip to content

Commit

Permalink
Remove hacky on-demand building of libraries/*/ghc.mk, put it back in…
Browse files Browse the repository at this point in the history
… 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).
  • Loading branch information
simonmar committed May 22, 2009
1 parent acc388d commit 44fa400
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions boot
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ do
chmod +x $f
fi
done

# Create libraries/*/{ghc.mk,GNUmakefile}
sh boot-pkgs

0 comments on commit 44fa400

Please sign in to comment.