compensate for gmp/configure sometimes not being executable

[ghc-hetmet.git] / rts / Makefile

diff --git a/rts/Makefile b/rts/Makefile
index 43368d4..d187547 100644 (file)
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -124,11 +124,6 @@ SRC_CC_OPTS += -DNOSMP
 SRC_HC_OPTS += -optc-DNOSMP
 endif
 
-ifeq "$(GhcWithTablesNextToCode)" "YES"
-SRC_CC_OPTS += -DTABLES_NEXT_TO_CODE
-SRC_HC_OPTS += -optc-DTABLES_NEXT_TO_CODE
-endif
-
 ifneq "$(DLLized)" "YES"
 SRC_HC_OPTS += -static
 endif
@@ -249,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