Page MenuHomeFreeBSD
Files F106115020

D26044.id77132.diff
No OneTemporary
Actions

D26044.id77132.diff
View Options

Index: head/share/mk/bsd.lib.mk
===================================================================
--- head/share/mk/bsd.lib.mk
+++ head/share/mk/bsd.lib.mk
@@ -245,9 +245,7 @@
lib${LIB_PRIVATE}${LIB}.a: ${OBJS} ${STATICOBJS}
@${ECHO} building static ${LIB} library
@rm -f ${.TARGET}
- ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' \
- ${LORDER} ${OBJS} ${STATICOBJS} | ${TSORT} ${TSORTFLAGS}` ${ARADD}
- ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
+ ${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
.endif
.if !defined(INTERNALLIB)
@@ -261,9 +259,7 @@
lib${LIB_PRIVATE}${LIB}_p.a: ${POBJS}
@${ECHO} building profiled ${LIB} library
@rm -f ${.TARGET}
- ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' \
- ${LORDER} ${POBJS} | ${TSORT} ${TSORTFLAGS}` ${ARADD}
- ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
+ ${AR} ${ARFLAGS} ${.TARGET} ${POBJS} ${ARADD}
.endif
.if defined(LLVM_LINK)
@@ -319,9 +315,7 @@
@${INSTALL_LIBSYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} ${SHLIB_NAME} ${SHLIB_LINK}
.endif
${_LD:N${CCACHE_BIN}} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
- -o ${.TARGET} -Wl,-soname,${SONAME} \
- `NM='${NM}' NMFLAGS='${NMFLAGS}' ${LORDER} ${SOBJS} | \
- ${TSORT} ${TSORTFLAGS}` ${LDADD}
+ -o ${.TARGET} -Wl,-soname,${SONAME} ${SOBJS} ${LDADD}
.if ${MK_CTF} != "no"
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
.endif
@@ -347,7 +341,6 @@
@${ECHO} building special pic ${LIB} library
@rm -f ${.TARGET}
${AR} ${ARFLAGS} ${.TARGET} ${SOBJS} ${ARADD}
- ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
.endif
.if defined(BUILD_NOSSP_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
@@ -360,7 +353,6 @@
@${ECHO} building special nossp pic ${LIB} library
@rm -f ${.TARGET}
${AR} ${ARFLAGS} ${.TARGET} ${NOSSPSOBJS} ${ARADD}
- ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
.endif
.endif # !defined(INTERNALLIB)
@@ -376,7 +368,6 @@
@${ECHO} building pie ${LIB} library
@rm -f ${.TARGET}
${AR} ${ARFLAGS} ${.TARGET} ${PIEOBJS} ${ARADD}
- ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
.endif
.if defined(_SKIP_BUILD)
Index: head/share/mk/sys.mk
===================================================================
--- head/share/mk/sys.mk
+++ head/share/mk/sys.mk
@@ -150,7 +150,7 @@
.if defined(%POSIX)
ARFLAGS ?= -rv
.else
-ARFLAGS ?= -crD
+ARFLAGS ?= -crsD
.endif
RANLIB ?= ranlib
.if !defined(%POSIX)

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 26, 3:37 PM (12 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15605743
Default Alt Text
D26044.id77132.diff (2 KB)

Event Timeline