projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
quiet some new spewage
[ghc-hetmet.git]
/
ghc.mk
diff --git
a/ghc.mk
b/ghc.mk
index
661305e
..
03066d9
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-327,6
+327,7
@@
$(eval $(call addPackage,process))
$(eval $(call addPackage,random))
$(eval $(call addPackage,extensible-exceptions))
$(eval $(call addPackage,haskell98))
$(eval $(call addPackage,random))
$(eval $(call addPackage,extensible-exceptions))
$(eval $(call addPackage,haskell98))
+$(eval $(call addPackage,haskell2010))
$(eval $(call addPackage,hpc))
$(eval $(call addPackage,pretty))
$(eval $(call addPackage,template-haskell))
$(eval $(call addPackage,hpc))
$(eval $(call addPackage,pretty))
$(eval $(call addPackage,template-haskell))
@@
-403,6
+404,7
@@
ghc/stage2/package-data.mk: compiler/stage2/package-data.mk
# libraries
utils/haddock/dist/package-data.mk: compiler/stage2/package-data.mk
# libraries
utils/haddock/dist/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/hsc2hs/dist-install/package-data.mk: compiler/stage2/package-data.mk
utils/compare_sizes/dist/package-data.mk: compiler/stage2/package-data.mk
@@
-1000,10
+1002,10
@@
windows-binary-dist-prep:
cd bindistprep && "$(TAR_CMD)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
windows-installer:
cd bindistprep && "$(TAR_CMD)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
windows-installer:
-ifeq "$(ISCC)" ""
- @echo No ISCC, so not making installer
+ifeq "$(ISCC_CMD)" ""
+ @echo No ISCC_CMD, so not making installer
else
else
- "$(ISCC)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss
+ "$(ISCC_CMD)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss
endif
# tryTimes tries to run its third argument multiple times, until it
endif
# tryTimes tries to run its third argument multiple times, until it