diff options
Diffstat (limited to 'pkgtools/bootstrap-mk-files/files/bsd.lib.mk')
| -rw-r--r-- | pkgtools/bootstrap-mk-files/files/bsd.lib.mk | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/pkgtools/bootstrap-mk-files/files/bsd.lib.mk b/pkgtools/bootstrap-mk-files/files/bsd.lib.mk index 73564817c7e..c0cec7f726d 100644 --- a/pkgtools/bootstrap-mk-files/files/bsd.lib.mk +++ b/pkgtools/bootstrap-mk-files/files/bsd.lib.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.1.1.1 2006/07/14 23:13:00 jlam Exp $ +# $NetBSD: bsd.lib.mk,v 1.2 2007/08/10 13:04:13 joerg Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .if !target(__initialized__) @@ -161,7 +161,7 @@ FFLAGS+= ${FOPTS} .else @echo ${COMPILE.c:Q} ${.IMPSRC} @${COMPILE.c} ${.IMPSRC} -o ${.TARGET}.o - @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @${LD} -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .endif @@ -181,7 +181,7 @@ FFLAGS+= ${FOPTS} .else @echo ${COMPILE.c:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET} @${COMPILE.c} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o - @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @${LD} -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .endif @@ -194,7 +194,7 @@ FFLAGS+= ${FOPTS} .else @echo ${COMPILE.cc:Q} ${.IMPSRC} @${COMPILE.cc} ${.IMPSRC} -o ${.TARGET}.o - @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @${LD} -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .endif @@ -214,7 +214,7 @@ FFLAGS+= ${FOPTS} .else @echo ${COMPILE.cc:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET} @${COMPILE.cc} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o - @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @${LD} -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .endif @@ -224,7 +224,7 @@ FFLAGS+= ${FOPTS} .else @echo ${COMPILE.f:Q} ${.IMPSRC} @${COMPILE.f} ${.IMPSRC} -o ${.TARGET}.o - @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @${LD} -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .endif @@ -234,7 +234,7 @@ FFLAGS+= ${FOPTS} .else @echo ${COMPILE.f:Q} -pg ${.IMPSRC} -o ${.TARGET} @${COMPILE.f} -pg ${.IMPSRC} -o ${.TARGET}.o - @${LD} -X -r ${.TARGET}.o -o ${.TARGET} + @${LD} -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .endif @@ -244,7 +244,7 @@ FFLAGS+= ${FOPTS} .else @echo ${COMPILE.f:Q} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET} @${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o - @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @${LD} -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .endif @@ -257,7 +257,7 @@ FFLAGS+= ${FOPTS} .else @echo ${COMPILE.m:Q} ${.IMPSRC} @${COMPILE.m} ${.IMPSRC} -o ${.TARGET}.o - @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @${LD} -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .endif @@ -267,7 +267,7 @@ FFLAGS+= ${FOPTS} .else @echo ${COMPILE.m:Q} -pg ${.IMPSRC} -o ${.TARGET} @${COMPILE.m} -pg ${.IMPSRC} -o ${.TARGET}.o - @${LD} -X -r ${.TARGET}.o -o ${.TARGET} + @${LD} -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .endif @@ -277,26 +277,26 @@ FFLAGS+= ${FOPTS} .else @echo ${COMPILE.m:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET} @${COMPILE.m} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o - @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @${LD} -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .endif .S.o .s.o: @echo ${COMPILE.S:Q} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} @${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o - @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @${LD} -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .S.po .s.po: @echo ${COMPILE.S:Q} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET} @${COMPILE.S} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o - @${LD} -X -r ${.TARGET}.o -o ${.TARGET} + @${LD} -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .S.so .s.so: @echo ${COMPILE.S:Q} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET} @${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o - @${LD} -x -r ${.TARGET}.o -o ${.TARGET} + @${LD} -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .if ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \ @@ -375,14 +375,14 @@ lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} \ @echo building shared ${LIB} library \(version ${SHLIB_FULLVERSION}\) @rm -f lib${LIB}.so.${SHLIB_FULLVERSION} .if defined(DESTDIR) - $(LD) -nostdlib -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \ + $(LD) -nostdlib -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \ ${SHLIB_LDSTARTFILE} \ --whole-archive ${SOLIB} \ --no-whole-archive ${LDADD} \ -L${DESTDIR}${LIBDIR} ${RPATH_FLAG}${LIBDIR} \ ${SHLIB_LDENDFILE} .else - $(LD) -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \ + $(LD) -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \ ${SHLIB_LDSTARTFILE} \ --whole-archive ${SOLIB} --no-whole-archive ${LDADD} \ ${SHLIB_LDENDFILE} |