From 549524f84f685bd3f010ff2dc239c1d02b09d3e3 Mon Sep 17 00:00:00 2001 From: matt Date: Thu, 15 Mar 2007 17:27:15 +0000 Subject: [PATCH] Deal with MKPICLIB != no. --- libexec/ld.elf_so/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile index d9d45b522312..fd0bd6b32e90 100644 --- a/libexec/ld.elf_so/Makefile +++ b/libexec/ld.elf_so/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2007/02/23 01:17:11 matt Exp $ +# $NetBSD: Makefile,v 1.77 2007/03/15 17:27:15 matt Exp $ .include # for OBJECT_FMT definition .include # for SHLINKINSTALLDIR definition @@ -54,11 +54,17 @@ DBG= -O3 -fomit-frame-pointer CPPFLAGS+= -DRTLD_DEFAULT_LIBRARY_PATH=\"${SHLIBDIR}:${LIBDIR}\" .endif -LDADD+= -L${CLIBOBJ} -L${DESTDIR}${LIBDIR} -lc_pic +LDADD+= -L${CLIBOBJ} -L${DESTDIR}${LIBDIR} +.if ${MKPICLIB} != "no" +LDADD+= -lc_pic .if ${MKPICINSTALL} != "no" DPADD+= ${LIBC_PIC} .endif DPADD+= ${CLIBOBJ}/libc_pic.a +.else +LDADD+= -lc +DPADD+= ${CLIBOBJ}/libc.a +.endif STRIPFLAG=