From: Ian Lynagh <igloo@earth.li>
Date: Wed, 9 May 2007 14:25:57 +0000 (+0000)
Subject: Cabal now uses filepath, so we need a bootstrapping filepath too
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=6ac403be68c9ce9bf6ee6b78b9c70c69454dcde5

Cabal now uses filepath, so we need a bootstrapping filepath too
---

diff --git a/compat/Makefile b/compat/Makefile
index fe7aa79..9d85c5c 100644
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -8,6 +8,7 @@ ALL_DIRS = \
 	Distribution/Compat \
 	Language/Haskell \
 	System \
+	System/FilePath \
 	System/Directory \
 	cbits
 
@@ -48,6 +49,9 @@ SRC_HC_OPTS += $(filter-out -D%, $(GhcHcOpts) $(GhcStage1HcOpts))
 # CPP symbol, so we have to do it by hand:
 SRC_CC_OPTS += -D__GHC_PATCHLEVEL__=$(GhcPatchLevel)
 
+# This module shouldn't be compiled itself, only #included into other files
+EXCLUDED_SRCS += System/FilePath/Internal.hs
+
 ifeq "$(ghc_ge_603)" "YES"
 # These modules are provided in GHC 6.3+
 EXCLUDED_SRCS += \
@@ -60,6 +64,8 @@ SRC_MKDEPENDHS_OPTS += \
 SRC_HC_OPTS += -ignore-package Cabal
 endif
 
+SRC_HC_OPTS += -ignore-package filepath
+
 # Some explicit dependencies, needed because ghc -M can't discover the
 # true dependencies of these stub files.
 System/Directory/Internals.$(way_)o : $(FPTOOLS_TOP)/libraries/base/System/Directory/Internals.hs
diff --git a/compat/compat.mk b/compat/compat.mk
index 82a3792..62057d1 100644
--- a/compat/compat.mk
+++ b/compat/compat.mk
@@ -45,6 +45,9 @@ SRC_MKDEPENDHS_OPTS += \
 	-optdep--exclude-module=Distribution.ParseUtils \
 	-optdep--exclude-module=Distribution.Compiler \
 	-optdep--exclude-module=Distribution.Version \
+	-optdep--exclude-module=System.FilePath \
+	-optdep--exclude-module=System.FilePath.Posix \
+	-optdep--exclude-module=System.FilePath.Windows \
 	-optdep--exclude-module=System.Directory.Internals
 
 PACKAGE_CABAL =
diff --git a/libraries/Makefile b/libraries/Makefile
index 41311b3..be487e3 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -90,7 +90,7 @@ CONFIGURE_OPTS += --enable-split-objs
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
 endif
 
-BOOTSTRAPPING_CABAL = bootstrapping.cabal
+BOOTSTRAPPING_STAMPS = $(addprefix stamp/bootstrapping.,Cabal filepath)
 
 .PHONY: subdirs
 
@@ -99,11 +99,8 @@ subdirs:
 
 .PHONY: boot
 
-boot: ifBuildable/ifBuildable \
+boot: $(BOOTSTRAPPING_STAMPS) ifBuildable/ifBuildable \
 	  $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup)
-	# XXX Hideous hacks:
-	$(GENPRIMOP) --make-haskell-source < ../compiler/prelude/primops.txt > base/GHC/Prim.hs
-	$(GENPRIMOP) --make-haskell-wrappers < ../compiler/prelude/primops.txt > base/GHC/PrimopWrappers.hs
 
 # We build the Setup program in a setup subdirectory to stop it trying
 # to use bits of base and Cabal when we build those packages.
@@ -112,22 +109,25 @@ boot: ifBuildable/ifBuildable \
 # We ought to be depending on %/Setup.*hs, but make makes that difficult.
 
 $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
-%/setup/Setup: stamp/$(BOOTSTRAPPING_CABAL)
+%/setup/Setup: $(BOOTSTRAPPING_STAMPS)
 	-$(RM) -rf $*/setup
 	mkdir $*/setup
 	$(CP) $*/Setup.*hs $*/setup
-	cd $*/setup && $(GHC) -Wall --make -i../../$(BOOTSTRAPPING_CABAL) Setup.*hs -o Setup
+	cd $*/setup && $(GHC) -i../../bootstrapping.Cabal \
+	                      -i../../bootstrapping.filepath \
+	                      -Wall -cpp --make Setup.*hs -o Setup
 
-ifBuildable/ifBuildable: ifBuildable.hs stamp/$(BOOTSTRAPPING_CABAL)
+ifBuildable/ifBuildable: ifBuildable.hs
 	-$(RM) -rf ifBuildable
 	mkdir ifBuildable
 	$(CP) ifBuildable.hs ifBuildable/
 	cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
 
-stamp/$(BOOTSTRAPPING_CABAL):
-	$(RM) -rf $(BOOTSTRAPPING_CABAL)
-	$(CP) -R Cabal $(BOOTSTRAPPING_CABAL)
-	$(FIND) $(BOOTSTRAPPING_CABAL) \( -name "*.o" -o -name "*.hi" \) -exec $(RM) -f {} \;
+$(BOOTSTRAPPING_STAMPS): stamp/bootstrapping.%:
+	$(RM) -rf bootstrapping.$*
+	$(CP) -R $* bootstrapping.$*
+	$(FIND) bootstrapping.$* \( -name "*.o" -o -name "*.hi" \) \
+	                         -exec $(RM) -f {} \;
 	touch $@
 
 .PHONY: all build configure
@@ -231,8 +231,8 @@ install.library.%: stamp/configure.library.install.% \
 distclean: clean
 
 clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
-	$(RM) -f stamp/$(BOOTSTRAPPING_CABAL)
-	$(RM) -rf $(BOOTSTRAPPING_CABAL)
+	$(RM) -f stamp/bootstrapping.*
+	$(RM) -rf bootstrapping.*
 	$(RM) -rf ifBuildable
 	$(RM) -f libraries.txt index.html doc-index.html