diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-04-12 13:30:02 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-05-28 11:14:57 +0100 |
| commit | d30d47e5a819a7900054dd089b21d769259fdffa (patch) | |
| tree | 4a81aab983f5c762a6eee990e1cf9f9dc0940e97 /ghc.mk | |
| parent | e8832eb9f05ca46d9315250c3baf7010eb0630a4 (diff) | |
| download | haskell-d30d47e5a819a7900054dd089b21d769259fdffa.tar.gz | |
Make builds that use stage1 use "dist-install" consistently. This
makes it easier to remove everything built with stage1 in cases where
the build system or GHC wrongly thinks everything is up to date.
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -439,13 +439,13 @@ ghc/stage2/package-data.mk: compiler/stage2/package-data.mk # package-data.mk is sufficient, as that in turn depends on all the # libraries utils/haddock/dist/package-data.mk: compiler/stage2/package-data.mk -utils/ghc-pwd/dist/package-data.mk: compiler/stage2/package-data.mk +utils/ghc-pwd/dist-install/package-data.mk: compiler/stage2/package-data.mk utils/ghc-cabal/dist-install/package-data.mk: compiler/stage2/package-data.mk utils/ghc-pkg/dist-install/package-data.mk: compiler/stage2/package-data.mk utils/hsc2hs/dist-install/package-data.mk: compiler/stage2/package-data.mk -utils/compare_sizes/dist/package-data.mk: compiler/stage2/package-data.mk -utils/runghc/dist/package-data.mk: compiler/stage2/package-data.mk +utils/compare_sizes/dist-install/package-data.mk: compiler/stage2/package-data.mk +utils/runghc/dist-install/package-data.mk: compiler/stage2/package-data.mk # add the final two package.conf dependencies: ghc-prim depends on RTS, # and RTS depends on libffi. @@ -910,7 +910,7 @@ $(eval $(call bindist,.,\ mk/config.mk.in \ $(INPLACE_BIN)/mkdirhier \ utils/ghc-cabal/dist-install/build/tmp/ghc-cabal \ - utils/ghc-pwd/dist/build/tmp/ghc-pwd \ + utils/ghc-pwd/dist-install/build/tmp/ghc-pwd \ $(BINDIST_WRAPPERS) \ $(BINDIST_PERL_SOURCES) \ $(BINDIST_LIBS) \ |