From 37ded2a72c6f737220e8da45af53123388aa6062 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Mon, 14 Dec 2015 23:25:31 +0000 Subject: [PATCH] Follow-up r290423: Don't use CSH for buildenv shell. It does not properly import PATH; the PATH is reset by included profile files on startup which breaks the biggest feature of buildenv (using sysrooted cc from WORLDTMP) Spotted by: smh, kib Sponsored by: EMC / Isilon Storage Division --- Makefile.inc1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 4a3fefd3ae9..8a438984b57 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -146,7 +146,11 @@ CLEANDIR= cleandir LOCAL_TOOL_DIRS?= PACKAGEDIR?= ${DESTDIR}/${DISTDIR} +.if empty(SHELL:M*csh*) BUILDENV_SHELL?=${SHELL} +.else +BUILDENV_SHELL?=/bin/sh +.endif SVN?= /usr/local/bin/svn SVNFLAGS?= -r HEAD