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:
3245f93
)
build base3-compat
author
Simon Marlow
<marlowsd@gmail.com>
Mon, 11 Aug 2008 14:38:31 +0000
(14:38 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Mon, 11 Aug 2008 14:38:31 +0000
(14:38 +0000)
compiler/ghc.cabal
patch
|
blob
|
history
compiler/ghci/InteractiveUI.hs
patch
|
blob
|
history
libraries/Makefile
patch
|
blob
|
history
packages
patch
|
blob
|
history
utils/ghc-pkg/ghc-pkg.cabal
patch
|
blob
|
history
diff --git
a/compiler/ghc.cabal
b/compiler/ghc.cabal
index
735e8fb
..
5a62841
100644
(file)
--- a/
compiler/ghc.cabal
+++ b/
compiler/ghc.cabal
@@
-33,7
+33,7
@@
Library
Exposed: False
if flag(base3)
Exposed: False
if flag(base3)
- Build-Depends: base >= 3 && < 4,
+ Build-Depends: base >= 3 && < 5,
directory >= 1 && < 1.1,
process >= 1 && < 1.1,
bytestring >= 0.9 && < 0.10,
directory >= 1 && < 1.1,
process >= 1 && < 1.1,
bytestring >= 0.9 && < 0.10,
diff --git
a/compiler/ghci/InteractiveUI.hs
b/compiler/ghci/InteractiveUI.hs
index
9b59f02
..
896728b
100644
(file)
--- a/
compiler/ghci/InteractiveUI.hs
+++ b/
compiler/ghci/InteractiveUI.hs
@@
-337,8
+337,7
@@
interactiveUI session srcs maybe_exprs = do
#endif
-- initial context is just the Prelude
#endif
-- initial context is just the Prelude
- prel_mod <- GHC.findModule session (GHC.mkModuleName "Prelude")
- (Just basePackageId)
+ prel_mod <- GHC.findModule session (GHC.mkModuleName "Prelude") Nothing
GHC.setContext session [] [prel_mod]
default_editor <- findEditor
GHC.setContext session [] [prel_mod]
default_editor <- findEditor
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
d759d8b
..
062399a
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-41,7
+41,7
@@
include $(TOP)/mk/cabal-flags.mk
# Any libraries listed here should also be in ../packages
# Any libraries listed here should also be in ../packages
-SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base array packedstring
+SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base base3-compat array packedstring
SUBDIRS += containers bytestring old-locale old-time filepath directory
ifeq "$(GhcLibsWithUnix)" "YES"
SUBDIRS += unix
SUBDIRS += containers bytestring old-locale old-time filepath directory
ifeq "$(GhcLibsWithUnix)" "YES"
SUBDIRS += unix
@@
-289,7
+289,10
@@
build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
html: doc
html: doc
-doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
+# No docs for compat libraries for now.
+DOC_SUBDIRS = $(filter-out %-compat, $(SUBDIRS))
+
+doc: $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR))
sh gen_contents_index --inplace
# Making hyperlinked source only works if we have hscolour
sh gen_contents_index --inplace
# Making hyperlinked source only works if we have hscolour
@@
-297,7
+300,7
@@
ifneq "$(HSCOLOUR)" ""
CABAL_HADDOCK_FLAGS=--hyperlink-source
endif
CABAL_HADDOCK_FLAGS=--hyperlink-source
endif
-$(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
+$(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)):\
doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
cabal-bin ifBuildable/ifBuildable bootstrapping.conf
if $(IFBUILDABLE) $*; then \
doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
cabal-bin ifBuildable/ifBuildable bootstrapping.conf
if $(IFBUILDABLE) $*; then \
diff --git
a/packages
b/packages
index
583ba69
..
d27d17a
100644
(file)
--- a/
packages
+++ b/
packages
@@
-5,6
+5,7
@@
utils/hsc2hs hsc2hs darcs
libraries/array packages/array darcs
libraries/base packages/base darcs
utils/hsc2hs hsc2hs darcs
libraries/array packages/array darcs
libraries/base packages/base darcs
+libraries/base3-compat packages/base3-compat darcs
libraries/bytestring packages/bytestring darcs
libraries/Cabal packages/Cabal darcs
libraries/containers packages/containers darcs
libraries/bytestring packages/bytestring darcs
libraries/Cabal packages/Cabal darcs
libraries/containers packages/containers darcs
@@
-41,4
+42,3
@@
libraries/xhtml extralibs packages/xhtml darcs
libraries/dph dph packages/dph darcs
testsuite testsuite testsuite darcs
nofib nofib nofib darcs
libraries/dph dph packages/dph darcs
testsuite testsuite testsuite darcs
nofib nofib nofib darcs
-
diff --git
a/utils/ghc-pkg/ghc-pkg.cabal
b/utils/ghc-pkg/ghc-pkg.cabal
index
90722a6
..
03d475f
100644
(file)
--- a/
utils/ghc-pkg/ghc-pkg.cabal
+++ b/
utils/ghc-pkg/ghc-pkg.cabal
@@
-20,7
+20,7
@@
Executable ghc-pkg
Main-Is: Main.hs
Extensions: CPP, ForeignFunctionInterface
if flag(base3)
Main-Is: Main.hs
Extensions: CPP, ForeignFunctionInterface
if flag(base3)
- Build-Depends: base >= 3 && < 4,
+ Build-Depends: base >= 3 && < 5,
directory >= 1 && < 1.1,
process >= 1 && < 1.1,
pretty >= 1 && < 1.1
directory >= 1 && < 1.1,
process >= 1 && < 1.1,
pretty >= 1 && < 1.1