X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMakefile;h=d187547c39f0985127f24c8a8c64cd3b574a1631;hb=f39ff24bc78da5ba09db8864ecbd7d1055b332db;hp=43368d41a615fc574edc53c3866384e529eaedc1;hpb=8c2549461d624ad5cfec9be3266bdfd016371658;p=ghc-hetmet.git

diff --git a/rts/Makefile b/rts/Makefile
index 43368d4..d187547 100644
--- 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