X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fbootstrap.mk;h=1b0bd23e2dabc27053599766c457a34cb6c96be5;hb=2fda738875042f7d2339f18b6c8b43ef7901bc94;hp=46267959c86a72f6827aa6403bd95f39e6308cc5;hpb=08f6d46191ffd7a4e9f215aadcd253ba42bbda3e;p=ghc-hetmet.git

diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index 4626795..1b0bd23 100644
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -39,10 +39,6 @@ PLATFORM_CC_OPTS += -static
 PLATFORM_HC_BOOT_CC_OPTS += -finhibit-size-directive
 endif
 
-ifeq "$(mingw32_TARGET_OS)" "1"
-PLATFORM_CC_OPTS += -mno-cygwin
-endif
-
 ifeq "$(alpha_TARGET_ARCH)" "1"
 PLATFORM_CC_OPTS += -static -w
 PLATFORM_HC_BOOT_CC_OPTS += -mieee
@@ -81,13 +77,8 @@ else
 UNDERSCORE=
 endif
 
-ifeq "$(HaveLibGmp)" "NO"
-DASH_L_GHC_RTS_GMP_DIR=-L$(FPTOOLS_TOP_ABS)/$(GHC_RTS_DIR_REL)/gmp
-endif
-
 HC_BOOT_LD_OPTS =				\
    -L$(FPTOOLS_TOP_ABS)/$(GHC_RTS_DIR_REL)	\
-   $(DASH_L_GHC_RTS_GMP_DIR)                    \
    -L$(FPTOOLS_TOP_ABS)/libraries/base		\
    -L$(FPTOOLS_TOP_ABS)/libraries/base/cbits	\
    -L$(FPTOOLS_TOP_ABS)/libraries/haskell98	\
@@ -132,7 +123,7 @@ HC_BOOT_LD_OPTS += \
    -u "$(UNDERSCORE)base_GHCziPack_unpackCString_closure" \
    -u "$(UNDERSCORE)base_GHCziIOBase_stackOverflow_closure" \
    -u "$(UNDERSCORE)base_GHCziIOBase_heapOverflow_closure" \
-   -u "$(UNDERSCORE)base_GHCziIOBase_NonTermination_closure" \
+   -u "$(UNDERSCORE)base_GHCziIOBase_nonTermination_closure" \
    -u "$(UNDERSCORE)base_GHCziIOBase_BlockedOnDeadMVar_closure" \
    -u "$(UNDERSCORE)base_GHCziIOBase_Deadlock_closure" \
    -u "$(UNDERSCORE)base_GHCziWeak_runFinalizzerBatch_closure" \