From c98f3820a04e7ada895c6733890a1dd6e30ee7e3 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 20 Jan 2018 19:22:15 -0500 Subject: [PATCH] compilation: process make.defaults in parent profiles, too. --- compilation | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/compilation b/compilation index 1dc51de..6320e70 100644 --- a/compilation +++ b/compilation @@ -1,9 +1,24 @@ #!/bin/sh -# Grab CFLAGS, etc. from the profile... -if [ -f /etc/portage/make.profile/make.defaults ]; then - . /etc/portage/make.profile/make.defaults -fi +# Grab CFLAGS, etc. from our profile after first processing its parent +# profiles recursively +load_profile_defaults() { + local profile="${1}" + if [ -f "${profile}/parent" ]; then + for parent in $(cat "${profile}/parent"); do + local _parent_path="${profile}/${parent}" + load_profile_defaults "${_parent_path}" + done + fi + + if [ -f "${profile}/make.defaults" ]; then + . "${profile}/make.defaults" + echo "loaded ${profile}/make.defaults" + fi +} + +load_profile_defaults /etc/portage/make.profile + # and from make.conf, allowing the values in make.conf to override the # ones in the profile. @@ -15,10 +30,8 @@ fi # Not a portage variable, but it's real handy. REPOS="${DISTDIR}/../repositories" -# These are really the only two that make sense to export to +# These are really the only variables that make sense to export to # subsequent commands. export CFLAGS export CXXFLAGS - -# LDFLAGS comes from.. somewhere else. -export LDFLAGS="-Wl,-O1 -Wl,--as-needed" +export LDFLAGS -- 2.43.2