summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2019-08-25 16:52:01 -0700
committerMatt Turner <mattst88@gentoo.org>2019-08-26 08:30:11 -0700
commit46819eabbee23cee91ef5c025b0d2bd8b8c43f96 (patch)
tree52a8f730d80188fc2f04d748dd6ff550cbdc10be
parentapp-emacs/autoconf-mode: Bump EAPI to 7. (diff)
downloadgentoo-46819eab.tar.gz
gentoo-46819eab.tar.bz2
gentoo-46819eab.zip
profiles/sparc: Move LIBDIR assignments
Signed-off-by: Matt Turner <mattst88@gentoo.org>
-rw-r--r--profiles/arch/sparc/make.defaults3
-rw-r--r--profiles/default/linux/sparc/17.0/make.defaults7
2 files changed, 3 insertions, 7 deletions
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 66fd2ca7a08a..d78ba38801a4 100644
--- 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
index 15095e86283a..000000000000
--- 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"