From 45e0c113518d7cc8e05d17fc6b7c7f66f3134065 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sun, 22 Oct 2017 22:50:19 +0000 Subject: [PATCH] Prefer SRCTOP paths for bits we're grabbing from libc. Sponsored by: Netflix --- sys/boot/geli/Makefile | 2 +- sys/boot/powerpc/boot1.chrp/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/boot/geli/Makefile b/sys/boot/geli/Makefile index 527d1c6a5464..1e53bc70fd51 100644 --- a/sys/boot/geli/Makefile +++ b/sys/boot/geli/Makefile @@ -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 diff --git a/sys/boot/powerpc/boot1.chrp/Makefile b/sys/boot/powerpc/boot1.chrp/Makefile index 1caacd8b5840..9ebd7a821549 100644 --- a/sys/boot/powerpc/boot1.chrp/Makefile +++ b/sys/boot/powerpc/boot1.chrp/Makefile @@ -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