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 /rules/build-prog.mk | |
| 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.
Diffstat (limited to 'rules/build-prog.mk')
| -rw-r--r-- | rules/build-prog.mk | 4 |
1 files changed, 2 insertions, 2 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 |