Date: Fri, 22 Apr 2016 20:31:29 +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: r298487 - head/share/mk Message-ID: <201604222031.u3MKVTXl066409@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Apr 22 20:31:29 2016 New Revision: 298487 URL: https://svnweb.freebsd.org/changeset/base/298487 Log: Fix error when SRCCONF is empty. Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/src.sys.mk Modified: head/share/mk/src.sys.mk ============================================================================== --- head/share/mk/src.sys.mk Fri Apr 22 18:16:12 2016 (r298486) +++ head/share/mk/src.sys.mk Fri Apr 22 20:31:29 2016 (r298487) @@ -8,7 +8,9 @@ .if !defined(_WITHOUT_SRCCONF) # Allow user to configure things that only effect src tree builds. SRCCONF?= /etc/src.conf -.if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && !target(_srcconf_included_) +.if !empty(SRCCONF) && \ + (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && \ + !target(_srcconf_included_) # Validate that the user didn't try setting an env-only variable in # their src.conf. This benefits from already including bsd.mkopt.mk.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604222031.u3MKVTXl066409>