svn commit: r292235 - head

[Bryan Drewery]

Author: bdrewery
Date: Mon Dec 14 23:25:31 2015
New Revision: 292235
URL: https://svnweb.freebsd.org/changeset/base/292235

Log:
  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

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Mon Dec 14 23:09:30 2015	(r292234)
+++ head/Makefile.inc1	Mon Dec 14 23:25:31 2015	(r292235)
@@ -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