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-prog.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-prog.mk')
| -rw-r--r-- | rules/build-prog.mk | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk index 6ce4d6f264..2c1836abed 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -170,20 +170,19 @@ ifeq "$$($1_$2_$$($1_$2_PROGRAM_WAY)_HS_OBJS)" "" # We don't want to link the GHC RTS into C-only programs. There's no # point, and it confuses the test that all GHC-compiled programs # were compiled with the right GHC. -$1_$2_GHC_LD_OPTS = -no-auto-link-packages -no-hs-main +$1_$2_$$($1_$2_PROGRAM_WAY)_GHC_LD_OPTS += -no-auto-link-packages -no-hs-main endif -ifneq "$3" "0" -ifeq "$$(DYNAMIC_BY_DEFAULT)" "YES" -ifeq "$$(TargetOS_CPP)" "linux" -$1_$2_GHC_LD_OPTS = \ - -fno-use-rpaths \ - $$(foreach d,$$($1_$2_TRANSITIVE_DEPS),-optl-Wl$$(comma)-rpath -optl-Wl$$(comma)'$$$$ORIGIN/../$$d') -else ifeq "$$(TargetOS_CPP)" "darwin" -$1_$2_GHC_LD_OPTS = -optl-Wl,-headerpad_max_install_names -endif -endif -endif +# XXX +# ifneq "$3" "0" +# ifeq "$$(TargetOS_CPP)" "linux" +# $1_$2_dyn_GHC_LD_OPTS += \ +# -fno-use-rpaths \ +# $$(foreach d,$$($1_$2_TRANSITIVE_DEPS),-optl-Wl$$(comma)-rpath -optl-Wl$$(comma)'$$$$ORIGIN/../$$d') +# else ifeq "$$(TargetOS_CPP)" "darwin" +# $1_$2_dyn_GHC_LD_OPTS += -optl-Wl,-headerpad_max_install_names +# endif +# endif ifneq "$$(BINDIST)" "YES" # The quadrupled $'s here are because the _<way>_LIB variables aren't @@ -199,7 +198,7 @@ $1/$2/build/tmp/$$($1_$2_PROG) : \ ifeq "$$($1_$2_LINK_WITH_GCC)" "NO" $1/$2/build/tmp/$$($1_$2_PROG) : $$($1_$2_$$($1_$2_PROGRAM_WAY)_HS_OBJS) $$($1_$2_$$($1_$2_PROGRAM_WAY)_C_OBJS) $$($1_$2_$$($1_$2_PROGRAM_WAY)_S_OBJS) $$($1_$2_OTHER_OBJS) | $$$$(dir $$$$@)/. - $$(call cmd,$1_$2_HC) -o $$@ $$($1_$2_$$($1_$2_PROGRAM_WAY)_ALL_HC_OPTS) $$(LD_OPTS) $$($1_$2_GHC_LD_OPTS) $$($1_$2_$$($1_$2_PROGRAM_WAY)_HS_OBJS) $$($1_$2_$$($1_$2_PROGRAM_WAY)_C_OBJS) $$($1_$2_$$($1_$2_PROGRAM_WAY)_S_OBJS) $$($1_$2_OTHER_OBJS) $$(addprefix -l,$$($1_$2_EXTRA_LIBRARIES)) + $$(call cmd,$1_$2_HC) -o $$@ $$($1_$2_$$($1_$2_PROGRAM_WAY)_ALL_HC_OPTS) $$(LD_OPTS) $$($1_$2_$$($1_$2_PROGRAM_WAY)_GHC_LD_OPTS) $$($1_$2_$$($1_$2_PROGRAM_WAY)_HS_OBJS) $$($1_$2_$$($1_$2_PROGRAM_WAY)_C_OBJS) $$($1_$2_$$($1_$2_PROGRAM_WAY)_S_OBJS) $$($1_$2_OTHER_OBJS) $$(addprefix -l,$$($1_$2_EXTRA_LIBRARIES)) ifeq "$$(TargetOS_CPP)" "darwin" ifneq "$3" "0" ifeq "$$($1_$2_PROGRAM_WAY)" "dyn" |