diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-01-22 19:09:28 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-01-22 19:09:28 +0000 |
| commit | 295016c3c0aa1f407436136e39ababf2dc8b50c6 (patch) | |
| tree | 1979e477cbd3b789acf723f6c871b15bdbcc1d36 /rules/build-package-data.mk | |
| parent | d17afd1e4aa5c7a0992e5ac5b2cda325992706a8 (diff) | |
| download | haskell-295016c3c0aa1f407436136e39ababf2dc8b50c6.tar.gz | |
Simplify the build system, and remove 2 phases
From
http://hackage.haskell.org/trac/ghc/wiki/Building/Architecture/Idiom/PhaseOrdering
Phase 0:
Includes: package-data.mk files for things built by the
bootstrapping compiler.
Builds: the dependency files for hsc2hs and genprimopcode. We need
to do this now, as hsc2hs needs to be buildable in phase 1's
includes (so that we can make the hpc library's .hs source
files, which in turn is necessary for making its dependency
files), and genprimopcode needs to be buildable in phase 1's
includes (so that we can make the primop-*.hs-incl files,
which are sources for the stage1 compiler library, and thus
necessary for making its dependency files).
Phase 1:
Includes: dependency files for things built by the bootstrapping
compiler.
Builds: package-data.mk files for everything else. Note that this
requires configuring the packages, which means telling cabal
which ghc to use, and thus the stage1 compiler gets built
during this phase.
Phase "":
Includes: dependency files for everything else.
Builds: Everything else.
Diffstat (limited to 'rules/build-package-data.mk')
| -rw-r--r-- | rules/build-package-data.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index be33eabdb4..98f66e61c1 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -62,6 +62,7 @@ ifeq "$3" "0" $1_$2_CONFIGURE_OPTS += $$(BOOT_PKG_CONSTRAINTS) endif +ifneq "$$(BINDIST)" "YES" $1/$2/inplace-pkg-config : $1/$2/package-data.mk $1/$2/build/autogen/cabal_macros.h : $1/$2/package-data.mk @@ -75,5 +76,8 @@ ifneq "$$($1_$2_REGISTER_PACKAGE)" "NO" "$$($1_$2_GHC_PKG)" update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config endif endif +endif + +PACKAGE_DATA_MKS += $1/$2/package-data.mk endef |