From 46819eabbee23cee91ef5c025b0d2bd8b8c43f96 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 25 Aug 2019 16:52:01 -0700 Subject: [PATCH] profiles/sparc: Move LIBDIR assignments Signed-off-by: Matt Turner --- profiles/arch/sparc/make.defaults | 3 +++ profiles/default/linux/sparc/17.0/make.defaults | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 profiles/default/linux/sparc/17.0/make.defaults 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" -- 2.26.2