Comments only

[ghc-hetmet.git] / compiler / Makefile

diff --git a/compiler/Makefile b/compiler/Makefile
index c2cf225..f4ab45b 100644 (file)
--- 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."
 
@@ -719,8 +723,8 @@ all :: $(odir)/ghc-inplace ghc-inplace
 #   (On other system, -W isn't a pwd flag at all.)
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-#      MSys
-SCRIPT_SHELL = $(shell cd /bin; pwd -W)/sh
+#      MSys (...and cygwin with a mingw toolchain)
+SCRIPT_SHELL = $(shell cd /bin; pwd -W 2>/dev/null || echo "/bin")/sh
 else
 #      Cygwin and Unix
 SCRIPT_SHELL = /bin/sh