X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=8d95bf82ea5b477a749d364ca72615c7915db3bc;hb=a59f5d6552674928879cae0d225e6052876d5ca4;hp=7853affa3d79b81d01cd3d8e568c34943c0130c5;hpb=ac77a1eba3a7673241f371ce4aa6bf56323383bc;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 7853aff..8d95bf8 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -493,12 +493,10 @@ libraries/ghc-prim_dist-install_EXTRA_HADDOCK_SRCS = libraries/ghc-prim/dist-ins
 ifneq "$(CLEANING)" "YES"
 ifeq "$(INTEGER_LIBRARY)" "integer-gmp"
 libraries/base_dist-install_CONFIGURE_OPTS += --flags=-integer-simple
+else ifeq "$(INTEGER_LIBRARY)" "integer-simple"
+libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple
 else
-    ifeq "$(INTEGER_LIBRARY)" "integer-simple"
-	libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple
-    else
 $(error Unknown integer library: $(INTEGER_LIBRARY))
-    endif
 endif
 endif
 
@@ -569,6 +567,8 @@ endif
 
 ifeq "$(INTEGER_LIBRARY)" "integer-gmp"
 BUILD_DIRS += libraries/integer-gmp/gmp
+else ifneq "$(findstring clean,$(MAKECMDGOALS))" ""
+BUILD_DIRS += libraries/integer-gmp/gmp
 endif
 
 BUILD_DIRS += \
@@ -638,13 +638,19 @@ $(foreach lib,$(STAGE0_PACKAGES),$(eval \
   libraries/$(lib)_dist-boot_CONFIGURE_PHASE = 1))
 compiler_stage1_CONFIGURE_PHASE = 1
 ghc_stage1_CONFIGURE_PHASE = 1
+driver/ghc_dist_CONFIGURE_PHASE = 1
+driver/ghci_dist_CONFIGURE_PHASE = 1
+driver/haddock_dist_CONFIGURE_PHASE = 1
+utils/touchy_dist_CONFIGURE_PHASE = 1
 
 # In phase 2, the phase 1 things actually get built
 
 # Finally, the stage1 compiler is used to make the dependencies for
 # everything else, so we can now build the rest.
 compiler_stage2_CONFIGURE_PHASE = 3
+compiler_stage3_CONFIGURE_PHASE = 3
 ghc_stage2_CONFIGURE_PHASE = 3
+ghc_stage3_CONFIGURE_PHASE = 3
 
 $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \
   libraries/$(lib)_dist-install_CONFIGURE_PHASE = 3))
@@ -697,7 +703,7 @@ $(foreach p,$(STAGE0_PACKAGES),$(eval libraries/$p_dist-boot_DO_HADDOCK = NO))
 
 # Build the Haddock contents and index
 ifeq "$(HADDOCK_DOCS)" "YES"
-libraries/index.html: inplace/bin/haddock $(ALL_HADDOCK_FILES)
+libraries/index.html: inplace/bin/haddock$(exeext) $(ALL_HADDOCK_FILES)
 	cd libraries && sh gen_contents_index --inplace
 ifeq "$(phase)" ""
 $(eval $(call all-target,library_doc_index,libraries/index.html))
@@ -738,11 +744,7 @@ $(eval $(call build-package,libraries/bin-package-db,dist-boot,0))
 fixed_pkg_prev=
 $(foreach pkg,$(STAGE0_PACKAGES),$(eval $(call fixed_pkg_dep,$(pkg),dist-boot)))
 
-compiler/stage1/package-data.mk : \
-    libraries/Cabal/dist-boot/package-data.mk \
-    libraries/hpc/dist-boot/package-data.mk \
-    libraries/extensible-exceptions/dist-boot/package-data.mk \
-    libraries/bin-package-db/dist-boot/package-data.mk
+compiler/stage1/package-data.mk : $(fixed_pkg_prev)
 
 # Make sure we have all the GHCi libs by the time we've built
 # ghc-stage2.  DPH includes a bit of Template Haskell which needs the
@@ -1189,17 +1191,6 @@ clean : clean_files clean_libraries
 clean_files :
 	"$(RM)" $(RM_OPTS) $(CLEAN_FILES)
 
-ifneq "$(NO_CLEAN_GMP)" "YES"
-CLEAN_FILES += libraries/integer-gmp/gmp/gmp.h
-CLEAN_FILES += libraries/integer-gmp/gmp/libgmp.a
-
-clean : clean_gmp
-.PHONY: clean_gmp
-clean_gmp:
-	"$(RM)" $(RM_OPTS_REC) libraries/integer-gmp/gmp/objs
-	"$(RM)" $(RM_OPTS_REC) libraries/integer-gmp/gmp/gmpbuild
-endif
-
 .PHONY: clean_libraries
 clean_libraries: $(patsubst %,clean_libraries/%_dist-install,$(PACKAGES) $(PACKAGES_STAGE2))
 clean_libraries: $(patsubst %,clean_libraries/%_dist-boot,$(STAGE0_PACKAGES))