diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2010-09-23 09:56:42 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2010-09-23 09:56:42 +0000 |
| commit | 1c1ed8694bdd24b003fa5935d001a1835e9b0f4e (patch) | |
| tree | 618f8aa531dbc76dfcf45b315e3d1522d3366659 /rules | |
| parent | 21b05036b6659aa3370f76c24c0e08e7a31f302b (diff) | |
| download | haskell-1c1ed8694bdd24b003fa5935d001a1835e9b0f4e.tar.gz | |
Refactoring and tidy up in the build system
Instead of the ghc-stage and ghc-stage2-package files in a package, we
now have a list of these in ghc.mk. There are other similar lists (of
boot-packages and non-installable packages), so this is not too bad,
and is simpler.
While poking around in the top-level ghc.mk file I spotted various
opportunities to clean up and re-order some of the cruft that has
accumulated over time.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package.mk | 2 | ||||
| -rw-r--r-- | rules/extra-packages.mk | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/rules/build-package.mk b/rules/build-package.mk index fc3d0f71a6..7ce11feeb5 100644 --- a/rules/build-package.mk +++ b/rules/build-package.mk @@ -162,9 +162,7 @@ $$(foreach way,$$($1_$2_WAYS),$$(eval \ $$(call build-package-way,$1,$2,$$(way),$3) \ )) -ifneq "$$($1_$2_HADDOCK_ME)" "NO" $(call haddock,$1,$2) -endif endif # package-data.mk exists diff --git a/rules/extra-packages.mk b/rules/extra-packages.mk index 7218a6f569..271bc6d057 100644 --- a/rules/extra-packages.mk +++ b/rules/extra-packages.mk @@ -39,10 +39,6 @@ define extra-package # $1 = package root, $2 = package $(call trace, extra-package($1,$2)) EXTRA_PACKAGES += $2 -ifeq "$(wildcard libraries/$1/ghc-stage2-package)" "" $$(eval $$(call addPackage,$2)) -else -$$(eval $$(call addPackage2,$2)) -endif endef |