diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-11-08 21:46:46 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-11-08 21:46:46 +0000 |
| commit | 7dd7008f98c76024288899b8cea607141c91ada5 (patch) | |
| tree | 05855c7a8096b5e7809be322ef188ebc048b6a21 /rules/build-package-way.mk | |
| parent | 1a0af0ece368caf0b6752f05e5e571cd4137ef36 (diff) | |
| download | haskell-7dd7008f98c76024288899b8cea607141c91ada5.tar.gz | |
Give dynamic libraries, as well as programs, RPATHs
Based on a patch from markwright in #3072.
Diffstat (limited to 'rules/build-package-way.mk')
| -rw-r--r-- | rules/build-package-way.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index 7a028d5b88..60f4ecbcc0 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -69,7 +69,7 @@ ifeq "$3" "dyn" # On windows we have to supply the extra libs this one links to when building it. ifeq "$$(HostOS_CPP)" "mingw32" $$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS) - $$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) $$($1_$2_$3_ALL_OBJS) \ + $$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) $$($1_$2_$3_GHC_LD_OPTS) $$($1_$2_$3_ALL_OBJS) \ -shared -dynamic -dynload deploy \ $$(addprefix -l,$$($1_$2_EXTRA_LIBRARIES)) \ -no-auto-link-packages \ @@ -79,7 +79,7 @@ $$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS) else $$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS) - $$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) $$($1_$2_$3_ALL_OBJS) \ + $$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) $$($1_$2_$3_GHC_LD_OPTS) $$($1_$2_$3_ALL_OBJS) \ -shared -dynamic -dynload deploy \ $$(addprefix -l,$$($1_$2_EXTRA_LIBRARIES)) $$(addprefix -L,$$($1_$2_EXTRA_LIBDIRS)) \ -no-auto-link-packages \ |