From: simonm Date: Tue, 27 Apr 1999 09:37:04 +0000 (+0000) Subject: [project @ 1999-04-27 09:37:04 by simonm] X-Git-Tag: Approximately_9120_patches~6303 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=2948d495129c7d4d2067d4609fc8bf392a019d82;hp=739309eaab42ed72b4c076d6f2648bdc3455c97a;p=ghc-hetmet.git [project @ 1999-04-27 09:37:04 by simonm] - Don't add -DCOMPILING_RTS twice - *set* SRC_CC_OPTS rather than appending to it: we're using ghc as the C compiler, so normal gcc flags probably won't work. eg. if you put SRC_CC_OPTS += -g in your build.mk, it'll fall over here. --- diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile index 0a556e8..c7a7a67 100644 --- a/ghc/rts/Makefile +++ b/ghc/rts/Makefile @@ -1,5 +1,5 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.7 1999/03/03 19:26:31 sof Exp $ +# $Id: Makefile,v 1.8 1999/04/27 09:37:04 simonm Exp $ # This is the Makefile for the runtime-system stuff. # This stuff is written in C (and cannot be written in Haskell). @@ -54,7 +54,7 @@ WARNING_OPTS += -optc-Wbad-function-cast #WARNING_OPTS += -optc-Wconversion SRC_HC_OPTS += -I../includes -I. -Igum $(WARNING_OPTS) $(GhcRtsHcOpts) -optc-DCOMPILING_RTS -SRC_CC_OPTS += $(GhcRtsCcOpts) -optc-DCOMPILING_RTS +SRC_CC_OPTS = $(GhcRtsCcOpts) DLLWRAP = dllwrap