[project @ 2004-12-10 13:34:38 by simonmar]

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

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 99701b2..e18fc77 100644 (file)
--- 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 \