diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-14 23:25:31 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-14 23:25:31 +0000 |
| commit | 37ded2a72c6f737220e8da45af53123388aa6062 (patch) | |
| tree | 360400984a867c816b5651f31861d8ae4ab7d04f /Makefile.inc1 | |
| parent | ee6b38d3849ec2980b6276ef844d03ad4a2a7ec9 (diff) | |
| download | src-test2-37ded2a72c6f737220e8da45af53123388aa6062.tar.gz src-test2-37ded2a72c6f737220e8da45af53123388aa6062.zip | |
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
Notes
Notes:
svn path=/head/; revision=292235
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 4a3fefd3ae91..8a438984b571 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 |