X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=ddb657f3cf2ea8ac08ef25ea45d2c5246da21941;hb=33fe71479b74a25ec28bd8f487f00a81b1e22a7f;hp=d1565e9720b2f4a489c471a76440abebd65e5224;hpb=2b35afe9eaf4dc01b05729d2cbb9ffbdf30429ff;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index d1565e9..ddb657f 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -567,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 += \
@@ -646,7 +648,9 @@ utils/touchy_dist_CONFIGURE_PHASE = 1
 # 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))
@@ -1187,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))