diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2020-12-18 15:17:11 +0100 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2020-12-18 15:17:11 +0100 |
| commit | b21867acf090471435c04bb82561fe91981220a0 (patch) | |
| tree | 23bcbb3fb8faabecfe20440ac84efa9a95ef3718 /profiles | |
| parent | virtual/libcrypt: drop ppc-aix (diff) | |
| download | gentoo-b21867acf090471435c04bb82561fe91981220a0.tar.gz gentoo-b21867acf090471435c04bb82561fe91981220a0.tar.bz2 gentoo-b21867acf090471435c04bb82561fe91981220a0.zip | |
profiles/arch/base/make.defaults: resolve merge horror :(
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/arch/base/make.defaults | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults index f0ea8107cb11..0f4d4bedc582 100644 --- a/profiles/arch/base/make.defaults +++ b/profiles/arch/base/make.defaults @@ -3,7 +3,6 @@ USE_EXPAND_UNPREFIXED="ARCH" USE_EXPAND_IMPLICIT="ARCH" -USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-fbsd x86-linux x86-macos x86-solaris x86-winnt" USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 arm64-macos hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-fbsd x86-linux x86-macos x86-solaris x86-winnt" PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH" |