d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Really finish the removal of ${LDDESTDIR} in bsd.lib.mk,v 1.55.

Browse Source 
bsd.lib.mk,v 1.101 only did that partly.
This commit is contained in:
Ruslan Ermilov 2002-04-11 08:54:21 +00:00
parent f8b318ce58
commit de0d6977f9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/mk/bsd.obj.mk
View File

@ -144,7 +144,7 @@ checkdpadd:
echo "LDADD -> $$ldadd1" ; \
fi
.else
@dpadd=`echo \`ld -Bstatic -f ${LDDESTDIR} ${LDADD}\`` ; \
@dpadd=`echo \`ld -Bstatic -f ${LDADD}\`` ; \
if [ "$$dpadd" != "${DPADD}" ] ; then \
echo ${.CURDIR} ; \
echo "LDADD -> $$dpadd" ; \

6
share/mk/bsd.prog.mk
View File

@ -32,7 +32,7 @@ LDADD+= ${OBJCLIBS}
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
${PROG}: ${OBJS}
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDDESTDIR} ${LDADD}
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
.else !defined(SRCS)
@ -47,7 +47,7 @@ SRCS= ${PROG}.c
OBJS= ${PROG}.o
${PROG}: ${OBJS}
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDDESTDIR} ${LDADD}
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
.endif
.endif
@ -74,7 +74,7 @@ CLEANFILES+= ${PROG} ${OBJS}
.if defined(PROG)
_EXTRADEPEND:
.if ${OBJFORMAT} == aout
echo ${PROG}: `${CC} -Wl,-f ${CFLAGS} ${LDFLAGS} ${LDDESTDIR} \
echo ${PROG}: `${CC} -Wl,-f ${CFLAGS} ${LDFLAGS} \
${LDADD:S/^/-Wl,/}` >> ${DEPENDFILE}
.else
echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE}