svn commit: r330426 - stable/11

Bryan Drewery bdrewery at FreeBSD.org
Sun Mar 4 23:35:36 UTC 2018


Author: bdrewery
Date: Sun Mar  4 23:35:35 2018
New Revision: 330426
URL: https://svnweb.freebsd.org/changeset/base/330426

Log:
  MFC r325627:
  
    Deal with src.conf for top-level MAKEOBJDIRPREFIX guard.

Modified:
  stable/11/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/Makefile
==============================================================================
--- stable/11/Makefile	Sun Mar  4 23:34:04 2018	(r330425)
+++ stable/11/Makefile	Sun Mar  4 23:35:35 2018	(r330426)
@@ -171,10 +171,11 @@ PATH=	/sbin:/bin:/usr/sbin:/usr/bin
 MAKEOBJDIRPREFIX?=	/usr/obj
 _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} MK_AUTO_OBJ=no ${MAKE} \
     ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
+    SRCCONF=${SRCCONF} \
     -f /dev/null -V MAKEOBJDIRPREFIX dummy
 .if !empty(_MAKEOBJDIRPREFIX)
 .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
-	(in make.conf(5)) or command-line variable.
+	(in make.conf(5) or src.conf(5)) or command-line variable.
 .endif
 
 # We often need to use the tree's version of make to build it.


More information about the svn-src-all mailing list