From 9db4c813fc8427d22f905d2b41fa28b15e0957a9 Mon Sep 17 00:00:00 2001 From: sof Date: Fri, 17 Aug 2001 22:29:06 +0000 Subject: [PATCH] [project @ 2001-08-17 22:29:06 by sof] Add -I$(GHC_INCLUDE_DIR) to SRC_MKDEPENDHS_OPTS; ghc-4.0x needs this since 'mkdependHS' also chases #includes. Not an issue with ghc-5.xx's dep-generator, since it invokes CPP prior to gathering up the imports. This should bring ghc-4.08-based nightly builds back to life. --- ghc/compiler/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index d88a4a9..faf6cf3 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.190 2001/08/17 17:18:51 apt Exp $ +# $Id: Makefile,v 1.191 2001/08/17 22:29:06 sof Exp $ TOP = .. include $(TOP)/mk/boilerplate.mk @@ -223,6 +223,11 @@ SRC_HC_OPTS += \ # Disaster! Then the hc file sees the GHC 5.02 (or whatever) # include files. For the moment we've reverted to using # an explicit path in the .hs sources +# +# For the benefit of <5.00 compilers, do include GHC_INCLUDE_DIR +# when generating dependencies. (=> it gets passed onto mkdependHS, +# which needs it). +SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR) ifneq "$(mingw32_TARGET_OS)" "1" SRC_HC_OPTS += -package concurrent -package posix -package text -package util -- 1.7.10.4