diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-03-21 04:41:29 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-03-21 04:41:29 +0000 |
| commit | 54f9708639eb1417e7765bb5e670de707382c385 (patch) | |
| tree | b704a1d542a94cabdd8e3d295cf090f21215cf94 /profiles/features | |
| parent | add s390/s390x multilib settings (diff) | |
| download | gentoo-2-54f9708639eb1417e7765bb5e670de707382c385.tar.gz gentoo-2-54f9708639eb1417e7765bb5e670de707382c385.tar.bz2 gentoo-2-54f9708639eb1417e7765bb5e670de707382c385.zip | |
drop the multilib symlink overrides by pulling from the parent only
Diffstat (limited to 'profiles/features')
| -rw-r--r-- | profiles/features/32bit-userland/make.defaults | 10 | ||||
| -rw-r--r-- | profiles/features/32bit-userland/parent | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/profiles/features/32bit-userland/make.defaults b/profiles/features/32bit-userland/make.defaults index b7cf5c9efe88..61ede9fa8646 100644 --- a/profiles/features/32bit-userland/make.defaults +++ b/profiles/features/32bit-userland/make.defaults @@ -1,15 +1,7 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/32bit-userland/make.defaults,v 1.2 2008/12/26 11:09:44 bluebird Exp $ - -# We disable the symlink, since we won't be using it. -SYMLINK_LIB="no" +# $Header: /var/cvsroot/gentoo-x86/profiles/features/32bit-userland/make.defaults,v 1.3 2011/03/21 04:41:29 vapier Exp $ # We always need gcc64 for 32bit-userland STAGE1_USE="nptl nptlonly unicode gcc64" USE="gcc64" - -# Since we're creating a 32-bit userland, we want LIBDIR to be lib -LIBDIR_ppc="lib" -LIBDIR_x86="lib" -LIBDIR_sparc32="lib" diff --git a/profiles/features/32bit-userland/parent b/profiles/features/32bit-userland/parent index 9b90fe9346dc..ef64da6e1d20 100644 --- a/profiles/features/32bit-userland/parent +++ b/profiles/features/32bit-userland/parent @@ -1 +1 @@ -../multilib/lib32 +../multilib |