profiles/sparc: Move LIBDIR assignments

Signed-off-by: Matt Turner <mattst88@gentoo.org>

diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 66fd2ca7a08a4061286f0a47c8cc073566587155..d78ba38801a4521c777c585521124f082ce3e3d5 100644 (file)
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -27,6 +27,9 @@ CTARGET_sparc32="sparc-unknown-linux-gnu"
 # do NOT set CFLAGS_sparc64 here it'd break linux-headers for non-multilib
 # profiles
 
+LIBDIR_sparc32="lib"
+LIBDIR_sparc64="lib64"
+
 # Compiler flags
 CFLAGS="-O2 -mcpu=ultrasparc -pipe"
 CXXFLAGS="${CFLAGS}"

diff --git a/profiles/default/linux/sparc/17.0/make.defaults b/profiles/default/linux/sparc/17.0/make.defaults
deleted file mode 100644 (file)
index 15095e8..0000000
--- a/profiles/default/linux/sparc/17.0/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# LIBDIR_* moved from features/multilib, #609178.
-# TODO: figure out whether this can be moved to arch/sparc
-LIBDIR_sparc32="lib"
-LIBDIR_sparc64="lib64"