diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-07-11 00:50:58 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-09-08 13:06:09 +0200 |
| commit | 8be43dd966c9c56e530eab266d6bf2710f9b07f4 (patch) | |
| tree | 9e99e1420124df5d4047fdb692f1d9178d6bcdb7 /utils | |
| parent | 330fbbdacc71a7bb465195e24e268a947fe97412 (diff) | |
| download | haskell-8be43dd966c9c56e530eab266d6bf2710f9b07f4.tar.gz | |
Build system: cleanup BUILD_DIRS + add lots of Notes
Summary:
See Note [CrossCompiling vs Stage1Only] in mk/config.mk.in.
See Note [Stage1Only vs stage=1] in mk/config.mk.in.
See Note [No stage2 packages when CrossCompiling or Stage1Only].
Also:
* use stage2 to build mkUserGuidePart, as was probably intended.
Now the following represent the same set of packages:
- packages that we build with ghc-stage2
- packages that depend on the ghc library
Those packages are: haddock, mkUserGuidePart and ghctags.
* don't let utils that don't depend on the ghc library depend on its
package-data.mk file. Instead, let those utils directly depend on
the package-data.mk files of the stage1 packages. Not sure if it
improves anything, but I found it easier to explain what's going on
this way.
(partially) reviewed by: austin
Differential Revision: https://phabricator.haskell.org/D1218
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-pkg/ghc.mk | 2 | ||||
| -rw-r--r-- | utils/mkUserGuidePart/ghc.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk index c5f0b6254e..f7d97debfa 100644 --- a/utils/ghc-pkg/ghc.mk +++ b/utils/ghc-pkg/ghc.mk @@ -49,6 +49,7 @@ utils/ghc-pkg_dist_PROGNAME = ghc-pkg utils/ghc-pkg_dist_SHELL_WRAPPER = YES utils/ghc-pkg_dist_INSTALL_INPLACE = YES +# See Note [Stage1Only vs stage=1] in mk/config.mk.in. ifeq "$(Stage1Only)" "YES" # Install the copy of ghc-pkg from the dist directory when running 'make # install' (it's the only copy we have at this stage). @@ -70,6 +71,7 @@ utils/ghc-pkg/dist/package-data.mk: \ # # See Note [Why build certain utils twice?]. +# See Note [Stage1Only vs stage=1] in mk/config.mk.in. ifneq "$(Stage1Only)" "YES" utils/ghc-pkg_dist-install_USES_CABAL = YES utils/ghc-pkg_dist-install_PROGNAME = ghc-pkg diff --git a/utils/mkUserGuidePart/ghc.mk b/utils/mkUserGuidePart/ghc.mk index 9a09087f4e..30b050e305 100644 --- a/utils/mkUserGuidePart/ghc.mk +++ b/utils/mkUserGuidePart/ghc.mk @@ -15,4 +15,4 @@ utils/mkUserGuidePart_PACKAGE = mkUserGuidePart utils/mkUserGuidePart_dist_PROGNAME = mkUserGuidePart utils/mkUserGuidePart_dist_INSTALL_INPLACE = YES -$(eval $(call build-prog,utils/mkUserGuidePart,dist,1)) +$(eval $(call build-prog,utils/mkUserGuidePart,dist,2)) |