discardTask(): reset task->tso to avoid confusion later

[ghc-hetmet.git] / ghc / rts / Makefile

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index f8a7c73..ef3e244 100644 (file)
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -124,6 +124,8 @@ SRC_HC_OPTS += -static
 endif
 # SRC_HC_OPTS += -fPIC
 
+RtsMessages_CC_OPTS += -DProjectVersion=\"$(ProjectVersion)\"
+
 ifeq "$(way)" "mp"
 SRC_HC_OPTS += -I$$PVM_ROOT/include
 endif
@@ -313,7 +315,6 @@ SRC_HC_OPTS += \
   -\#include Storage.h \
   -\#include SchedAPI.h \
   -\#include Timer.h \
-  -\#include Itimer.h \
   -\#include ProfHeap.h \
   -\#include LdvProfile.h \
   -\#include Profiling.h \
@@ -323,6 +324,8 @@ SRC_HC_OPTS += \
 
 ifeq "$(Windows)" "YES"
 PrimOps_HC_OPTS += -\#include '<windows.h>' -\#include win32/AsyncIO.h
+else
+PrimOps_HC_OPTS += -\#include posix/Itimer.h
 endif
 
 # -O3 helps unroll some loops (especially in copy() with a constant argument).