From: simonmar <unknown>
Date: Tue, 19 Nov 2002 11:14:50 +0000 (+0000)
Subject: [project @ 2002-11-19 11:14:50 by simonmar]
X-Git-Tag: Approx_11550_changesets_converted~1436
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=15ff8ef00b2c91ebc5e70a6139b615d5c0407bfe;p=ghc-hetmet.git

[project @ 2002-11-19 11:14:50 by simonmar]
- Pull in the appropriate $(GhcStageNHcOpts)

- re-instate -I$(GHC_INCLUDE_DIR) in $(SRC_CC_OPTS) that I
  accidentally removed in rev. 1.226
---

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 7eca529..f3142b2 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -328,8 +328,8 @@ SRC_HC_OPTS += -package concurrent -package util
 endif
 endif
 
-SRC_CC_OPTS += -Iparser -I. -O
-SRC_HC_OPTS += -recomp $(GhcHcOpts)
+SRC_CC_OPTS += -Iparser -I. -I$(GHC_INCLUDE_DIR) -O
+SRC_HC_OPTS += -recomp $(GhcHcOpts) $(GhcStage$(stage)HcOpts)
 SRC_HC_OPTS += -H16M
 
 ifeq "$(BootingFromHc)" "YES"