diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-09-30 19:25:52 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-09-30 19:25:52 +0000 |
| commit | 5d0747c093ee5b45e08871503c6210662958657b (patch) | |
| tree | 13471aa882b09806a645cbae917301a1a9b12d6d | |
| parent | 915ea7223dfd3050922008b0ca6dfdf921b31578 (diff) | |
| download | haskell-5d0747c093ee5b45e08871503c6210662958657b.tar.gz | |
Handle EXTRA_LIBRARIES when building programs
And set hp2ps's EXTRA_LIBRARIES. Based on a patch from Sergei Trofimovich.
| -rw-r--r-- | rules/build-prog.mk | 4 | ||||
| -rw-r--r-- | utils/hp2ps/ghc.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk index 76e2cb671e..3fbed21efb 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -129,10 +129,10 @@ 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) + "$$($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)) 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) + "$$(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)) endif # Note [lib-depends] if this program is built with stage1 or greater, we diff --git a/utils/hp2ps/ghc.mk b/utils/hp2ps/ghc.mk index 86ae7282b5..d2d31470e6 100644 --- a/utils/hp2ps/ghc.mk +++ b/utils/hp2ps/ghc.mk @@ -15,11 +15,11 @@ utils/hp2ps_dist_C_SRCS = AreaBelow.c Curves.c Error.c Main.c \ HpFile.c Marks.c Scale.c TraceElement.c \ Axes.c Dimensions.c Key.c PsFile.c Shade.c \ Utilities.c +utils/hp2ps_dist_EXTRA_LIBRARIES = m 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)) |