diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-12-14 23:25:31 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-12-14 23:25:31 +0000 |
| commit | 7f5e20fb23016ae7b835795949a815aff827d80d (patch) | |
| tree | 360400984a867c816b5651f31861d8ae4ab7d04f /Makefile.inc1 | |
| parent | 1eacff75a71fce92843f64cd44bff42d2ae7f9f3 (diff) | |
| download | FreeBSD-src-7f5e20fb23016ae7b835795949a815aff827d80d.zip FreeBSD-src-7f5e20fb23016ae7b835795949a815aff827d80d.tar.gz | |
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
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 4a3fefd..8a43898 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 |
