From owner-svn-src-head@freebsd.org Sun Oct 22 22:50:20 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CA3CCE38B8A; Sun, 22 Oct 2017 22:50:20 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 95A3F7C5EE; Sun, 22 Oct 2017 22:50:20 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9MMoJFl001721; Sun, 22 Oct 2017 22:50:19 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9MMoJMM001719; Sun, 22 Oct 2017 22:50:19 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710222250.v9MMoJMM001719@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 22 Oct 2017 22:50:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324879 - in head/sys/boot: geli powerpc/boot1.chrp X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot: geli powerpc/boot1.chrp X-SVN-Commit-Revision: 324879 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Oct 2017 22:50:21 -0000 Author: imp Date: Sun Oct 22 22:50:19 2017 New Revision: 324879 URL: https://svnweb.freebsd.org/changeset/base/324879 Log: Prefer SRCTOP paths for bits we're grabbing from libc. Sponsored by: Netflix Modified: head/sys/boot/geli/Makefile head/sys/boot/powerpc/boot1.chrp/Makefile Modified: head/sys/boot/geli/Makefile ============================================================================== --- head/sys/boot/geli/Makefile Sun Oct 22 22:50:15 2017 (r324878) +++ head/sys/boot/geli/Makefile Sun Oct 22 22:50:19 2017 (r324879) @@ -21,7 +21,7 @@ CFLAGS+= -m32 WARNS?= 0 # string functions from libc -.PATH: ${.CURDIR}/../../../lib/libc/string +.PATH: ${SRCTOP}/lib/libc/string SRCS+= bcmp.c bcopy.c bzero.c # Our password input method Modified: head/sys/boot/powerpc/boot1.chrp/Makefile ============================================================================== --- head/sys/boot/powerpc/boot1.chrp/Makefile Sun Oct 22 22:50:15 2017 (r324878) +++ head/sys/boot/powerpc/boot1.chrp/Makefile Sun Oct 22 22:50:19 2017 (r324879) @@ -19,7 +19,7 @@ LDFLAGS=-nostdlib -static -Wl,-N .include "../Makefile.inc" -.PATH: ${.CURDIR}/../../../libkern ${.CURDIR}/../../../../lib/libc/powerpc/gen ${.CURDIR} +.PATH: ${.CURDIR}/../../../libkern ${SRCTOP}/lib/libc/powerpc/gen ${.CURDIR} # The following inserts out objects into a template HFS # created by generate-hfs.sh