compensate for gmp/configure sometimes not being executable

[ghc-hetmet.git] / rts / Makefile

diff --git a/rts/Makefile b/rts/Makefile
index 2522a0b..d187547 100644 (file)
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -119,6 +119,11 @@ SRC_CC_OPTS += $(STANDARD_OPTS)
 SRC_CC_OPTS += $(GhcRtsCcOpts)
 SRC_HC_OPTS += $(GhcRtsHcOpts)
 
+ifneq "$(GhcWithSMP)" "YES"
+SRC_CC_OPTS += -DNOSMP
+SRC_HC_OPTS += -optc-DNOSMP
+endif
+
 ifneq "$(DLLized)" "YES"
 SRC_HC_OPTS += -static
 endif
@@ -239,7 +244,7 @@ boot ::
        if [ -f gmp/config.status ]; then \
           cd gmp && CC=$(WhatGccIsCalled) ./config.status; \
         else \
-          cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no \
+          cd gmp && CC=$(WhatGccIsCalled) $(SHELL) configure --enable-shared=no \
                        --host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'`; \
        fi