diff options
| author | ru <ru@FreeBSD.org> | 2002-04-11 08:54:21 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-04-11 08:54:21 +0000 |
| commit | 4247d565b702e50256a1a255bd655f88d70f1b0a (patch) | |
| tree | 7615db0eb69e75944fa3d9fdab5dd7ebd0e56e4c | |
| parent | 03183c74c32489047b7a4658f2ff8089b05e6d07 (diff) | |
| download | FreeBSD-src-4247d565b702e50256a1a255bd655f88d70f1b0a.zip FreeBSD-src-4247d565b702e50256a1a255bd655f88d70f1b0a.tar.gz | |
Really finish the removal of ${LDDESTDIR} in bsd.lib.mk,v 1.55.
bsd.lib.mk,v 1.101 only did that partly.
| -rw-r--r-- | share/mk/bsd.obj.mk | 2 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index 720b2fe..79ac516 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -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" ; \ diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 4163118..7daaad9 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -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} |
