From cdeb8a20af8c0ea129a5617aa576dc40fb3f3fd2 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 10 Dec 2010 18:54:02 +0000 Subject: [PATCH] Don't link the GHC RTS into our C-only programs --- rules/build-prog.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rules/build-prog.mk b/rules/build-prog.mk index ff8d25b..473bae8 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -124,9 +124,16 @@ ifeq "$$(BootingFromHc)" "YES" $1_$2_LINK_WITH_GCC = YES endif +ifeq "$$($1_$2_v_HS_OBJS)" "" +# We don't want to link the GHC RTS into C-only programs. There's no +# point, and it confuses the test that all GHC-compiled programs +# were compiled with the right GHC. +$1_$2_GHC_LD_OPTS = -no-auto-link-packages -no-hs-main +endif + ifeq "$$($1_$2_LINK_WITH_GCC)" "NO" $1/$2/build/tmp/$$($1_$2_PROG) : $$($1_$2_v_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_OTHER_OBJS) | $$$$(dir $$$$@)/. - "$$($1_$2_HC)" -o $$@ $$($1_$2_v_ALL_HC_OPTS) $$(LD_OPTS) $$($1_$2_v_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_OTHER_OBJS) $$(addprefix -l,$$($1_$2_EXTRA_LIBRARIES)) + "$$($1_$2_HC)" -o $$@ $$($1_$2_v_ALL_HC_OPTS) $$(LD_OPTS) $$($1_$2_GHC_LD_OPTS) $$($1_$2_v_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_OTHER_OBJS) $$(addprefix -l,$$($1_$2_EXTRA_LIBRARIES)) else $1/$2/build/tmp/$$($1_$2_PROG) : $$($1_$2_v_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_OTHER_OBJS) | $$$$(dir $$$$@)/. "$$(CC)" -o $$@ $$($1_$2_v_ALL_CC_OPTS) $$(LD_OPTS) $$($1_$2_v_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_OTHER_OBJS) $$($1_$2_v_EXTRA_CC_OPTS) $$(addprefix -l,$$($1_$2_EXTRA_LIBRARIES)) -- 1.7.10.4