[commit: ghc] master: Use stage1 build variables when building the RTS (0d92d9c)
git at git.haskell.org
git at git.haskell.org
Wed Jan 27 10:30:55 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/0d92d9cb6d65fd00f9910c3f6f85bc6c68f5543b/ghc
>---------------------------------------------------------------
commit 0d92d9cb6d65fd00f9910c3f6f85bc6c68f5543b
Author: Reid Barton <rwbarton at gmail.com>
Date: Wed Jan 27 11:05:50 2016 +0100
Use stage1 build variables when building the RTS
The fourth argument of distdir-way-opts was missing. So, for example,
SRC_HC_OPTS_STAGE1 was not used when building the RTS.
Test Plan: validate --slow
Reviewers: austin, bgamari, thomie
Reviewed By: thomie
Differential Revision: https://phabricator.haskell.org/D1857
>---------------------------------------------------------------
0d92d9cb6d65fd00f9910c3f6f85bc6c68f5543b
rts/ghc.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rts/ghc.mk b/rts/ghc.mk
index 71da10d..85fab78 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -160,7 +160,7 @@ ifneq "$$(findstring thr, $1)" ""
rts_$1_EXTRA_C_SRCS = rts/dist/build/sm/Evac_thr.c rts/dist/build/sm/Scav_thr.c
endif
-$(call distdir-way-opts,rts,dist,$1)
+$(call distdir-way-opts,rts,dist,$1,1) # 1 because the rts is built with stage1
$(call c-suffix-rules,rts,dist,$1,YES)
$(call cmm-suffix-rules,rts,dist,$1)
More information about the ghc-commits
mailing list