diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2007-09-17 10:58:04 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2007-09-17 10:58:04 +0000 |
| commit | fd7d38fe1d78059d146e99fea96786f1ffcb0c82 (patch) | |
| tree | ad34871f05023552f70d88eb9929c90609c8dbbc /eclass/gnustep-base.eclass | |
| parent | micq is now climm (diff) | |
| download | gentoo-2-fd7d38fe1d78059d146e99fea96786f1ffcb0c82.tar.gz gentoo-2-fd7d38fe1d78059d146e99fea96786f1ffcb0c82.tar.bz2 gentoo-2-fd7d38fe1d78059d146e99fea96786f1ffcb0c82.zip | |
avoid setting ld-flags more than once, by querying them first using is-ldflagq
Diffstat (limited to 'eclass/gnustep-base.eclass')
| -rw-r--r-- | eclass/gnustep-base.eclass | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass index 1bf0e1fc1b31..9434922a3e1d 100644 --- a/eclass/gnustep-base.eclass +++ b/eclass/gnustep-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.2 2007/08/19 18:15:04 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.3 2007/09/17 10:58:04 grobian Exp $ inherit eutils flag-o-matic @@ -98,15 +98,14 @@ egnustep_env() { # Set rpath in ldflags when available case ${CHOST} in *-linux-gnu|*-solaris*) - append-ldflags \ - -Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}" \ - -L"${GNUSTEP_SYSTEM_LIBRARIES}" - ;; - *) - append-ldflags \ - -L"${GNUSTEP_SYSTEM_LIBRARIES}" + is-ldflagq -Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}" \ + || append-ldflags \ + -Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}" ;; esac + is-ldflagq -L"${GNUSTEP_SYSTEM_LIBRARIES}" \ + || append-ldflags \ + -L"${GNUSTEP_SYSTEM_LIBRARIES}" # Set up env vars for make operations GS_ENV=( AUXILIARY_LDFLAGS="${LDFLAGS}" \ |