Commit 1b3fc029 authored by Anthony Mallet's avatar Anthony Mallet
Browse files

[mk] Simplify the 'trusted' environment setup target

Collapse the rules setting up the 'trusted' environment. This makes the errors
from 'make' less cryptic when a target fails.
parent 3ee9f00b
......@@ -31,8 +31,8 @@ _ENV_VARS+= MAKE MAKECONF ROBOTPKG_BASE ROBOTPKG_DIR
_ENV_VARS+= HOME PATH TERM TERMCAP DISPLAY XAUTHORITY SSH_AUTH_SOCK
_ENV_VARS+= http_proxy https_proxy ftp_proxy
.PHONY: unsetenv
unsetenv:
.PHONY: ${MAKECMDGOALS}
${MAKECMDGOALS}:
@${SETENV} -i \
$(foreach _,${_ENV_VARS}, \
$(if $(filter environment,$(origin $_)), \
......@@ -40,6 +40,3 @@ unsetenv:
_ROBOTPKG_NOW=`${DATE} "+%m%d%H%M%S"` \
ROBOTPKG_TRUSTED_ENV=robotpkg \
${MAKE} ${MFLAGS} ${MAKEOVERRIDES} ${MAKECMDGOALS}
${MAKECMDGOALS}: unsetenv
@:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment