Date: Sun, 8 Nov 2015 00:50:06 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290523 - head Message-ID: <201511080050.tA80o6qZ048255@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sun Nov 8 00:50:06 2015 New Revision: 290523 URL: https://svnweb.freebsd.org/changeset/base/290523 Log: Add a hack to workaround ZSH as BUILDENV_SHELL breaking CPUTYPE. ZSH considers CPUTYPE a magic variable that will be the output of 'uname -m' even if already set in environment when starting up. The CPUTYPE?= check in Makefile.inc1 and supporting overriding CPUTYPE manually in the buildenv shell make automatic workarounds too tricky here. ZSH should really respect variables set in the environment before trashing them. X-MFC-With: r290423 MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sat Nov 7 23:54:14 2015 (r290522) +++ head/Makefile.inc1 Sun Nov 8 00:50:06 2015 (r290523) @@ -784,6 +784,9 @@ buildenvvars: .PHONY BUILDENV_DIR?= ${.CURDIR} buildenv: .PHONY @echo Entering world for ${TARGET_ARCH}:${TARGET} +.if ${BUILDENV_SHELL:M*zsh*} + @echo For ZSH you must run: export CPUTYPE=${TARGET_CPUTYPE} +.endif @cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 ${BUILDENV_SHELL} \ || true
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511080050.tA80o6qZ048255>