commit: b21867acf090471435c04bb82561fe91981220a0
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 14:17:11 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 14:17:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b21867ac
profiles/arch/base/make.defaults: resolve merge horror :(
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
profiles/arch/base/make.defaults | 1 -
1 file changed, 1 deletion(-)
diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults
index f0ea8107cb1..0f4d4bedc58 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"
