diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-10-20 00:13:20 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-10-20 00:13:20 +0000 |
| commit | 9afe886d4c47a62b9f3963c78e56496251f0611b (patch) | |
| tree | 769eda7a7bbc126b12db59c5eafa4234007821cf /eclass/eutils.eclass | |
| parent | Version bump. (diff) | |
| download | historical-9afe886d4c47a62b9f3963c78e56496251f0611b.tar.gz historical-9afe886d4c47a62b9f3963c78e56496251f0611b.tar.bz2 historical-9afe886d4c47a62b9f3963c78e56496251f0611b.zip | |
fix the LD_LIBRARY_PATH logic in make_wrapper so that it works again #109793 by UncleOwen
Diffstat (limited to 'eclass/eutils.eclass')
| -rw-r--r-- | eclass/eutils.eclass | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index bf341402d090..57936932b0a4 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.209 2005/10/19 03:37:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.210 2005/10/20 00:13:20 vapier Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -1626,8 +1626,12 @@ make_wrapper() { cat << EOF > "${tmpwrapper}" #!/bin/sh cd "${chdir:-.}" -if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then - export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" +if [ -n "${libdir}" ] ; then + if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then + export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" + else + export LD_LIBRARY_PATH="${libdir}" + fi fi exec ${bin} "\$@" EOF |