From 076e25142a7220462d109ebfd9a9894e987fe525 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Fri, 2 May 2014 20:45:34 +0000 Subject: - Fix build WITHOUT_ZFS/WITHOUT_CDDL after r265229, bin/ps needs libjail. MFC after: 2 weeks X-MFC-with: r265229 --- rescue/rescue/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rescue') diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index ea0d1370d80c..4a4cd446fde9 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -52,7 +52,7 @@ CRUNCH_SRCDIRS+= bin CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \ ed expr getfacl hostname kenv kill ln ls mkdir mv \ pkill ps pwd realpath rm rmdir setfacl sh stty sync test -CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lutil +CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -ll -ltermcap -lutil CRUNCH_BUILDTOOLS+= bin/sh # Additional options for specific programs @@ -120,7 +120,7 @@ CRUNCH_PROGS_sbin+= zpool CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec .if ${MK_ZFS} != "no" -CRUNCH_LIBS+= -lavl -ljail -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem +CRUNCH_LIBS+= -lavl -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem .endif CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lsbuf -lufs -lz -- cgit v1.2.3 From c6063d0da8e1f8d8452b0c2ee1c7ad718c1a7052 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 6 May 2014 04:22:01 +0000 Subject: Use src.opts.mk in preference to bsd.own.mk except where we need stuff from the latter. --- rescue/librescue/Makefile | 2 +- rescue/rescue/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'rescue') diff --git a/rescue/librescue/Makefile b/rescue/librescue/Makefile index 62f5da1ba292..ad4931e52c66 100644 --- a/rescue/librescue/Makefile +++ b/rescue/librescue/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -.include +.include MK_SSP= no # Certain library entries have hard-coded references to diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 4a4cd446fde9..fc778f0aa280 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -3,7 +3,7 @@ MAN= -.include +.include MK_SSP= no PROG= rescue -- cgit v1.2.3