X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=f4ab45be285fc947cd27203d910ce37bb868a885;hb=07160d6128cd517f967749b169d03b3c1ebac0e3;hp=60c70fd9a93d0a67ecf2131e121f641039b48cbd;hpb=b4af1a0ff3d43e70e54629e89ffff62d49de1746;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 60c70fd..f4ab45b 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -346,6 +346,10 @@ endif
 	@echo "#define HOST_VENDOR \"$(TargetVendor_CPP)\"" >> $@
 	@echo "#define TARGET_VENDOR \"$(TargetVendor_CPP)\"" >> $@
 	@echo >> $@
+ifeq "$(GhcWithTablesNextToCode)" "YES"
+	@echo "#define TABLES_NEXT_TO_CODE 1" >> $@
+endif
+	@echo >> $@
 	@echo "#endif /* __PLATFORM_H__ */"          >> $@
 	@echo "Done."
 
@@ -720,7 +724,7 @@ all :: $(odir)/ghc-inplace ghc-inplace
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 #	MSys (...and cygwin with a mingw toolchain)
-SCRIPT_SHELL = $(shell cd /bin; pwd -W 2>/dev/null | echo "/bin")/sh
+SCRIPT_SHELL = $(shell cd /bin; pwd -W 2>/dev/null || echo "/bin")/sh
 else
 #	Cygwin and Unix
 SCRIPT_SHELL = /bin/sh