X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=596ca79aa55dbf0364d269d862a4b660fa09bf24;hb=9cb75205a0ffb89d9996ba8500493ba35d4b712f;hp=c31a486373c4edb765863e8d6d916fbf85b877b8;hpb=423d477bfecd490de1449c59325c8776f91d7aac;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index c31a486..596ca79 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -184,7 +184,7 @@ AUTO_APPLY_CMM = AutoApply$(_way).cmm
 ifneq "$(BootingFromHc)" "YES"
 $(AUTO_APPLY_CMM): $(GHC_GENAPPLY)
 	@$(RM) $@
-	$(GHC_GENAPPLY) $(if $(filter u,$(way)), -u) >$@
+	$(GHC_GENAPPLY) $(if $(filter $(way), u debug_u), -u) >$@
 endif
 
 EXTRA_CMM_SRCS += $(AUTO_APPLY_CMM)
@@ -225,11 +225,16 @@ endif
 ifneq "$(HaveLibGmp)" "YES"
 ifneq "$(HaveFrameworkHaskellSupport)" "YES"
 boot ::
-	cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no \
-		--host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'`
+	if [ -f gmp/config.status ]; then \
+	   cd gmp && CC=$(WhatGccIsCalled) ./config.status; \
+        else \
+	   cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no \
+		        --host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'`; \
+	fi
 
 # Slight cheatage here to pass host as target, but x-compilation isn't supported by ghc.
 
+ifeq "$(way)" ""
 all :: gmp/libgmp.a
 
 ifeq "$(DLLized)" "YES"
@@ -239,6 +244,7 @@ $(DLL_PEN)/gmp.dll:
 	$(MAKE) -C gmp gmp.dll
 	$(MV) gmp/gmp.dll $(DLL_PEN)
 endif
+endif
 
 install :: gmp/libgmp.a
 
@@ -285,6 +291,7 @@ endif
 
 # ToDo: should we really include Rts.h here?  Required for GNU_ATTRIBUTE().
 SRC_HC_OPTS += \
+  -I. \
   -\#include Prelude.h \
   -\#include Rts.h \
   -\#include RtsFlags.h \
@@ -293,6 +300,7 @@ SRC_HC_OPTS += \
   -\#include Schedule.h \
   -\#include Printer.h \
   -\#include Sanity.h \
+  -\#include STM.h \
   -\#include Storage.h \
   -\#include SchedAPI.h \
   -\#include Timer.h \
@@ -302,6 +310,10 @@ SRC_HC_OPTS += \
   -\#include Profiling.h \
   -\#include Apply.h
 
+ifeq "$(Windows)" "YES"
+PrimOps_HC_OPTS += -\#include '<windows.h>' -\#include win32/AsyncIO.h
+endif
+
 # Cmm must be compiled via-C for now, because the NCG can't handle loops
 SRC_HC_OPTS += -fvia-C