diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-06-19 20:47:24 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-06-19 20:47:24 +0000 |
| commit | c99b67a7947ea215f9c1d44ec022680e98920cd1 (patch) | |
| tree | b651dbc9948db013cc06944c3c063e0d1309dc05 /gnu | |
| parent | 212e02c8360c9ec101759e2dead7dbc99cfddf67 (diff) | |
| download | src-test2-c99b67a7947ea215f9c1d44ec022680e98920cd1.tar.gz src-test2-c99b67a7947ea215f9c1d44ec022680e98920cd1.zip | |
Utilize SYSROOT from r320119 in places where DESTDIR may be wanting WORLDTMP.
Since buildenv exports SYSROOT all of these uses will now look in
WORLDTMP by default.
sys/boot/efi/loader/Makefile
A LIBSTAND hack is no longer required for buildenv.
MFC after: 2 weeks
Sponsored by: Dell EMC Isilon
Notes
Notes:
svn path=/head/; revision=320122
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/grep/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile index 93c7324ea863..e8d6dd8ba4b5 100644 --- a/gnu/usr.bin/grep/Makefile +++ b/gnu/usr.bin/grep/Makefile @@ -14,7 +14,7 @@ SRCS= closeout.c dfa.c error.c exclude.c grep.c grepmat.c hard-locale.c \ xstrtoumax.c CLEANFILES+= gnugrep.1 -CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H +CFLAGS+=-I${.CURDIR} -I${SYSROOT:U${DESTDIR}}/usr/include/gnu -DHAVE_CONFIG_H .if ${MK_BSD_GREP} != "yes" LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \ |