aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Houchard <cognet@FreeBSD.org>2006-03-27 12:56:29 +0000
committerOlivier Houchard <cognet@FreeBSD.org>2006-03-27 12:56:29 +0000
commit6e7fd77b9edf91d9c5a0d81880d94726cb8cd4df (patch)
treeb76127ee2754190bf87adea9fdffc24d06b68afc
parent1db30bb2ddcbde1898fc8c6e5a1034b9b6c0c061 (diff)
downloadsrc-6e7fd77b9edf91d9c5a0d81880d94726cb8cd4df.tar.gz
src-6e7fd77b9edf91d9c5a0d81880d94726cb8cd4df.zip
*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.
Notes
Notes: svn path=/head/; revision=157177
-rw-r--r--rescue/rescue/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 7ccce9d1c6c0..0feeda307657 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