diff options
| author | jschauma <jschauma> | 2004-08-15 22:20:02 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2004-08-15 22:20:02 +0000 |
| commit | 0db2b80c6059f02e5e73d4a08897627afd91c328 (patch) | |
| tree | 8b1405c9edb40bb229bfb0877da60c81fbbe3c93 | |
| parent | b86d0029ff23044dfec690b807f07d7f932eb6ca (diff) | |
| download | pkgsrc-0db2b80c6059f02e5e73d4a08897627afd91c328.tar.gz | |
Use '-x' instead of '-X';
use '-none' instead of '-notall' to increase odds that this'll work under
older IRIX versions.
| -rw-r--r-- | bootstrap/mods/mk/IRIX.bsd.lib.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bootstrap/mods/mk/IRIX.bsd.lib.mk b/bootstrap/mods/mk/IRIX.bsd.lib.mk index b18f764f42a..a499328fee2 100644 --- a/bootstrap/mods/mk/IRIX.bsd.lib.mk +++ b/bootstrap/mods/mk/IRIX.bsd.lib.mk @@ -1,4 +1,4 @@ -# $NetBSD: IRIX.bsd.lib.mk,v 1.3 2004/08/15 22:15:18 jschauma Exp $ +# $NetBSD: IRIX.bsd.lib.mk,v 1.4 2004/08/15 22:20:02 jschauma Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .if !target(__initialized__) @@ -171,7 +171,7 @@ FFLAGS+= ${FOPTS} .else @echo ${COMPILE.c:Q} -pg ${.IMPSRC} -o ${.TARGET} @${COMPILE.c} -pg ${.IMPSRC} -o ${.TARGET}.o - @${LD} -X -r ${.TARGET}.o -o ${.TARGET} + @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .endif @@ -204,7 +204,7 @@ FFLAGS+= ${FOPTS} .else @echo ${COMPILE.cc:Q} -pg ${.IMPSRC} -o ${.TARGET} @${COMPILE.cc} -pg ${.IMPSRC} -o ${.TARGET}.o - @${LD} -X -r ${.TARGET}.o -o ${.TARGET} + @${LD} -x -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} -x -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} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .endif @@ -290,7 +290,7 @@ FFLAGS+= ${FOPTS} .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} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .S.so .s.so: @@ -376,13 +376,13 @@ lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} \ $(LD) -nostdlib -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \ ${SHLIB_LDSTARTFILE} \ -all archive ${SOLIB} \ - -notall ${LDADD} \ + -none ${LDADD} \ -L${DESTDIR}${LIBDIR} -rpath ${LIBDIR} \ ${SHLIB_LDENDFILE} .else $(LD) -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \ ${SHLIB_LDSTARTFILE} \ - -all ${SOLIB} -notall ${LDADD} \ + -all ${SOLIB} -none ${LDADD} \ ${SHLIB_LDENDFILE} .endif .if ${OBJECT_FMT} == "ELF" |