X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=e18fc775d3467cb635f5b63eb4b102399a2f6857;hb=2b8e1af0d3e2187c5e1ef7536a23b7e27f3a743e;hp=99701b2ffa07e1f749c739c2f178c4146f3fd4ac;hpb=e7111ac9dabf7d430c8fbab7966e16f84606e369;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 99701b2..e18fc77 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -225,8 +225,12 @@ 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.
 
@@ -287,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 \
@@ -295,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 \