From: Ian Lynagh <igloo@earth.li>
Date: Fri, 16 Jul 2010 23:53:03 +0000 (+0000)
Subject: Link programs that have no Haskell objects with gcc rather than ghc
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=8d1990f4c7f0993baae3f2ac709d8b5df2f0a5b3;p=ghc-hetmet.git

Link programs that have no Haskell objects with gcc rather than ghc
---

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))