Skip to content

Commit

Permalink
scons-utils.eclass: scons_clean_makeopts, mark internal
Browse files Browse the repository at this point in the history
  • Loading branch information
mgorny committed Jan 8, 2016
1 parent 5844fca commit a4de8aa
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions eclass/scons-utils.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ escons() {
fi

# if SCONSOPTS are _unset_, use cleaned MAKEOPTS
set -- scons ${SCONSOPTS-$(scons_clean_makeopts)} ${EXTRA_ESCONS} \
set -- scons ${SCONSOPTS-$(_scons_clean_makeopts)} ${EXTRA_ESCONS} \
"${@}"
echo "${@}" >&2
"${@}"
Expand All @@ -145,14 +145,15 @@ escons() {
return ${ret}
}

# @FUNCTION: scons_clean_makeopts
# @FUNCTION: _scons_clean_makeopts
# @INTERNAL
# @USAGE: [makeflags] [...]
# @DESCRIPTION:
# Strip the supplied makeflags (or ${MAKEOPTS} if called without
# an argument) of options not supported by SCons and make sure --jobs
# gets an argument. Output the resulting flag list (suitable
# for an assignment to SCONSOPTS).
scons_clean_makeopts() {
_scons_clean_makeopts() {
local new_makeopts

debug-print-function ${FUNCNAME} "${@}"
Expand Down
2 changes: 1 addition & 1 deletion eclass/tests/scons-utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ inherit scons-utils
test-scons_clean_makeopts() {
tbegin "scons_clean_makeopts() for ${1}"

local sconsopts=$(scons_clean_makeopts ${1}) ret=0
local sconsopts=$(_scons_clean_makeopts ${1}) ret=0

if [[ ${sconsopts} != ${2-${1}} ]]; then
eerror "Self-test failed:"
Expand Down

0 comments on commit a4de8aa

Please sign in to comment.