From 8d1990f4c7f0993baae3f2ac709d8b5df2f0a5b3 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 16 Jul 2010 23:53:03 +0000 Subject: [PATCH] Link programs that have no Haskell objects with gcc rather than ghc --- rules/build-prog.mk | 10 +++++++++- utils/hp2ps/ghc.mk | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/rules/build-prog.mk b/rules/build-prog.mk index 0e0a665..e9252eb 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -118,7 +118,15 @@ $$(foreach dir,$$($1_$2_HS_SRC_DIRS),\ $(call c-objs,$1,$2,v) $(call hs-objs,$1,$2,v) -ifeq "$$(BootingFromHc)" "NO" +$1_$2_LINK_WITH_GCC = NO +ifeq "$$(BootingFromHc)" "YES" +$1_$2_LINK_WITH_GCC = YES +endif +ifeq "$$($1_$2_v_HS_OBJS)" "" +$1_$2_LINK_WITH_GCC = YES +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) else diff --git a/utils/hp2ps/ghc.mk b/utils/hp2ps/ghc.mk index c113ddb..86ae728 100644 --- a/utils/hp2ps/ghc.mk +++ b/utils/hp2ps/ghc.mk @@ -19,6 +19,7 @@ utils/hp2ps_dist_PROG = hp2ps$(exeext) utils/hp2ps_dist_INSTALL = YES utils/hp2ps_CC_OPTS += -Iincludes +utils/hp2ps_CC_OPTS += -lm $(eval $(call build-prog,utils/hp2ps,dist,0)) -- 1.7.10.4