X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fhsc2hs%2FMakefile;h=7763183c8b1c4012d2ab97a803b81de08ec90ce1;hb=990faa74e434b1ab5578b36220a336c24cff834b;hp=751884163264415e432c6702016c449dc986e181;hpb=5b846fa36eee0f96c4c47128706d0131f8bb4113;p=ghc-hetmet.git

diff --git a/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile
index 7518841..7763183 100644
--- a/utils/hsc2hs/Makefile
+++ b/utils/hsc2hs/Makefile
@@ -14,6 +14,10 @@ SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
 SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
 endif
 
+ifeq "$(ghc_ge_605)" "NO"
+SRC_HC_OPTS += -cpp
+endif
+
 # This causes libghccompat.a to be used:
 include $(GHC_COMPAT_DIR)/compat.mk
 
@@ -97,6 +101,14 @@ install::
 endif
 endif
 
+# hsc2hs-inplace is needed to 'make boot' in compiler.
+# Do a recursive 'make all' after generating dependencies, because this
+# will work with 'make -j'.
+ifneq "$(BootingFromHc)" "YES"
+boot :: depend
+	$(MAKE) all
+endif
+
 # -----------------------------------------------------------------------------
 
 override datadir=$(libdir)