[commit: ghc] master: When DYNAMIC_BY_DEFAULT, make inplace wrappers for everything (14ddde0)
Ian Lynagh <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/14ddde0e40745395cd6d0cf26ca45bf0220b4aaa >--------------------------------------------------------------- commit 14ddde0e40745395cd6d0cf26ca45bf0220b4aaa Author: Ian Lynagh <[email protected]> Date: Mon Oct 22 18:22:42 2012 +0100 When DYNAMIC_BY_DEFAULT, make inplace wrappers for everything Even though e.g. inplace/bin/hpc doesn't normally need a shell wrapper, it does when we are using dynlibs, as we need to set the LD_LIBRARY_PATH so that it can find its libraries. >--------------------------------------------------------------- rules/build-prog.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/rules/build-prog.mk b/rules/build-prog.mk index 2328446..6ce4d6f 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -60,6 +60,8 @@ else ifneq "$$($1_$2_INSTALL_INPLACE)" "YES" $1_$2_WANT_INPLACE_WRAPPER = NO else ifeq "$$($1_$2_SHELL_WRAPPER)" "YES" $1_$2_WANT_INPLACE_WRAPPER = YES +else ifeq "$$(DYNAMIC_BY_DEFAULT)" "YES" +$1_$2_WANT_INPLACE_WRAPPER = YES else $1_$2_WANT_INPLACE_WRAPPER = NO endif