[commit: ghc] master: use GhcRtsHcOpts and GhcRtsCcOpts for the debug way too (1b7c1e5)

[Simon Marlow]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1b7c1e52f207fa6038d729048b81bddb7d7ea2b1

>---------------------------------------------------------------

commit 1b7c1e52f207fa6038d729048b81bddb7d7ea2b1
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Tue Jan 29 09:34:12 2013 +0000

    use GhcRtsHcOpts and GhcRtsCcOpts for the debug way too

>---------------------------------------------------------------

 rts/ghc.mk |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rts/ghc.mk b/rts/ghc.mk
index 1119a88..58d46de 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -131,13 +131,13 @@ define build-rts-way # args: $1 = way
 
 ifneq "$$(BINDIST)" "YES"
 
+rts_dist_$1_HC_OPTS := $$(GhcRtsHcOpts)
+rts_dist_$1_CC_OPTS := $$(GhcRtsCcOpts)
+
 # The per-way CC_OPTS
 ifneq "$$(findstring debug, $1)" ""
-rts_dist_$1_HC_OPTS = -O0
-rts_dist_$1_CC_OPTS = -g -O0
-else
-rts_dist_$1_HC_OPTS = $$(GhcRtsHcOpts)
-rts_dist_$1_CC_OPTS = $$(GhcRtsCcOpts)
+rts_dist_$1_HC_OPTS += -O0
+rts_dist_$1_CC_OPTS += -g -O0
 endif
 
 ifneq "$$(findstring dyn, $1)" ""