diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-10-14 01:31:20 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-10-14 01:31:20 +0100 |
| commit | a7c70e961208ceffd6a3a4626624740ea58dac0f (patch) | |
| tree | 0bffbe0e26f68491553a95f7040de67108c31ac6 /rules/build-prog.mk | |
| parent | 817e1d58628b9a40a13dddb8b9c28431b3d256cc (diff) | |
| download | haskell-a7c70e961208ceffd6a3a4626624740ea58dac0f.tar.gz | |
Move the RPATH computation into the build rules
It doesn't really belong in package-data.mk
Diffstat (limited to 'rules/build-prog.mk')
| -rw-r--r-- | rules/build-prog.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk index 239f55cdd4..a0cb9e64ce 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -175,7 +175,7 @@ ifneq "$3" "0" ifeq "$$(DYNAMIC_BY_DEFAULT)" "YES" $1_$2_GHC_LD_OPTS = \ -fno-use-rpaths \ - $$(addprefix -optl-Wl$$(comma)-rpath -optl-Wl$$(comma),$$($1_$2_RPATHS)) + $$(foreach d,$$($1_$2_TRANSITIVE_DEPS),-optl-Wl$$(comma)-rpath -optl-Wl$$(comma)'$$$$ORIGIN/../$$d') endif endif |