Module Name:    src
Committed By:   christos
Date:           Sun May 20 14:39:53 UTC 2018

Modified Files:
        src/share/mk: sys.mk

Log Message:
Also substitute ${X11SRCDIR} for the random seed for reproducible builds so
that the random seed is consistent.
XXX: pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/share/mk/sys.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.130 src/share/mk/sys.mk:1.131
--- src/share/mk/sys.mk:1.130	Sun Feb 25 13:53:23 2018
+++ src/share/mk/sys.mk	Sun May 20 10:39:53 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: sys.mk,v 1.130 2018/02/25 18:53:23 chs Exp $
+#	$NetBSD: sys.mk,v 1.131 2018/05/20 14:39:53 christos Exp $
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
 #
 # This file contains the basic rules for make(1) and is read first
@@ -55,7 +55,8 @@ CXXFLAGS?=	${CFLAGS:N-Wno-traditional:N-
 __ALLSRC1=	${empty(DESTDIR):?${.ALLSRC}:${.ALLSRC:S|^${DESTDIR}|^destdir|}}
 __ALLSRC2=	${empty(MAKEOBJDIR):?${__ALLSRC1}:${__ALLSRC1:S|^${MAKEOBJDIR}|^obj|}}
 __ALLSRC3=	${empty(NETBSDSRCDIR):?${__ALLSRC2}:${__ALLSRC2:S|^${NETBSDSRCDIR}|^src|}}
-__BUILDSEED=	${BUILDSEED}/${__ALLSRC3:O}/${.TARGET}
+__ALLSRC4=	${empty(X11SRCDIR):?${__ALLSRC3}:${__ALLSRC3:S|^${X11SRCDIR}|^xsrc|}}
+__BUILDSEED=	${BUILDSEED}/${__ALLSRC4:O}/${.TARGET}
 _CXXSEED?=	${BUILDSEED:D-frandom-seed=${__BUILDSEED:hash}}
 
 COMPILE.cc?=	${CXX} ${_CXXSEED} ${CXXFLAGS} ${DTRACE_OPTS} ${CPPFLAGS} -c

Reply via email to