Use stage1 build variables when building the RTS
authorReid Barton <rwbarton@gmail.com>
Wed, 27 Jan 2016 10:05:50 +0000 (11:05 +0100)
committerBen Gamari <ben@smart-cactus.org>
Wed, 27 Jan 2016 10:32:15 +0000 (11:32 +0100)
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

rts/ghc.mk

index 71da10d..85fab78 100644 (file)
@@ -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)