projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0f59059
)
Remove base3-compat
author
Ian Lynagh
<igloo@earth.li>
Tue, 22 Sep 2009 20:06:57 +0000
(20:06 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Tue, 22 Sep 2009 20:06:57 +0000
(20:06 +0000)
ghc.mk
patch
|
blob
|
history
packages
patch
|
blob
|
history
diff --git
a/ghc.mk
b/ghc.mk
index
2170c43
..
5952bee
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-165,9
+165,6
@@
NO_INCLUDE_DEPS = YES
# We want package-data.mk for show
endif
# We want package-data.mk for show
endif
-# We don't haddock base3-compat, as it has the same package name as base
-libraries/base3-compat_dist-install_DO_HADDOCK = NO
-
# We don't haddock the bootstrapping libraries
libraries/hpc_dist-boot_DO_HADDOCK = NO
libraries/Cabal_dist-boot_DO_HADDOCK = NO
# We don't haddock the bootstrapping libraries
libraries/hpc_dist-boot_DO_HADDOCK = NO
libraries/Cabal_dist-boot_DO_HADDOCK = NO
@@
-322,7
+319,6
@@
$(eval $(call addPackage,hpc))
$(eval $(call addPackage,pretty))
$(eval $(call addPackage,syb))
$(eval $(call addPackage,template-haskell))
$(eval $(call addPackage,pretty))
$(eval $(call addPackage,syb))
$(eval $(call addPackage,template-haskell))
-$(eval $(call addPackage,base3-compat))
$(eval $(call addPackage,Cabal))
$(eval $(call addPackage,binary))
$(eval $(call addPackage,bin-package-db))
$(eval $(call addPackage,Cabal))
$(eval $(call addPackage,binary))
$(eval $(call addPackage,bin-package-db))
@@
-593,12
+589,6
@@
$(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-instal
# XXX Hack; remove this
$(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += -Wwarn))
# XXX Hack; remove this
$(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += -Wwarn))
-# XXX we configure packages with the bootstrapping compiler (for
-# dependency reasons, see the phase ordering), which doesn't
-# necessarily support all the extensions we need, and Cabal filters
-# out the ones it thinks aren't supported.
-libraries/base3-compat_dist-install_HC_OPTS += -XPackageImports
-
# A useful pseudo-target
.PHONY: stage1_libs
stage1_libs : $(ALL_STAGE1_LIBS)
# A useful pseudo-target
.PHONY: stage1_libs
stage1_libs : $(ALL_STAGE1_LIBS)
diff --git
a/packages
b/packages
index
be62ec7
..
8f317be
100644
(file)
--- a/
packages
+++ b/
packages
@@
-21,7
+21,6
@@
utils/hsc2hs hsc2hs darcs
utils/haddock haddock2 darcs
libraries/array packages/array darcs
libraries/base packages/base darcs
utils/haddock haddock2 darcs
libraries/array packages/array darcs
libraries/base packages/base darcs
-libraries/base3-compat packages/base3-compat darcs
libraries/binary packages/binary darcs
libraries/bytestring packages/bytestring darcs
libraries/Cabal packages/Cabal darcs
libraries/binary packages/binary darcs
libraries/bytestring packages/bytestring darcs
libraries/Cabal packages/Cabal darcs