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 /usr.bin/grep | |
parent | 212e02c8360c9ec101759e2dead7dbc99cfddf67 (diff) | |
download | src-c99b67a7947ea215f9c1d44ec022680e98920cd1.tar.gz src-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 'usr.bin/grep')
-rw-r--r-- | usr.bin/grep/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile index 758eac7f9388..23dc8df828ed 100644 --- a/usr.bin/grep/Makefile +++ b/usr.bin/grep/Makefile @@ -82,7 +82,7 @@ CFLAGS+= -DWITHOUT_BZIP2 .endif .if ${MK_GNU_GREP_COMPAT} != "no" -CFLAGS+= -I${DESTDIR}/usr/include/gnu -DWITH_GNU +CFLAGS+= -I${SYSROOT:U${DESTDIR}}/usr/include/gnu -DWITH_GNU LIBADD+= gnuregex .endif |