From 6e7fd77b9edf91d9c5a0d81880d94726cb8cd4df Mon Sep 17 00:00:00 2001 From: Olivier Houchard Date: Mon, 27 Mar 2006 12:56:29 +0000 Subject: [PATCH] *sigh* Move the -lbsdxml after -lgeom, so that ld doesn't get confused and pretend he can't find the symbol from libbsdxml needed in libgeom. This should fix the rescue build breakage. --- rescue/rescue/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 7ccce9d1c6c..0feeda30765 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -134,11 +134,11 @@ CRUNCH_PROGS_sbin+= ipf # crunchgen does not like C++ programs; this should be fixed someday # CRUNCH_PROGS+= devd -CRUNCH_LIBS+= -lalias -lbsdxml -lcam -lcurses -ldevstat -lipsec +CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec .if ${MK_IPX} != "no" CRUNCH_LIBS+= -lipx .endif -CRUNCH_LIBS+= -lgeom -lkiconv -lmd -lreadline -lsbuf -lufs -lz +CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lreadline -lsbuf -lufs -lz .if ${MACHINE_ARCH} == "i386" CRUNCH_PROGS_sbin+= sconfig fdisk