Provide a way to override the default objcopy flags for library modules.

This commit is contained in:
christos 2012-01-28 21:32:13 +00:00
parent 811b418a32
commit c37ad7ee66
3 changed files with 28 additions and 22 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.README,v 1.290 2011/11/05 22:56:30 christos Exp $ # $NetBSD: bsd.README,v 1.291 2012/01/28 21:32:13 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94 # @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD This is the README file for the make "include" files for the NetBSD
@ -1731,6 +1731,9 @@ OBJCFLAGS Options to ${OBJC}. [${CFLAGS}]
OBJCOPY Copy and translate object files. [objcopy] OBJCOPY Copy and translate object files. [objcopy]
OBJCOPYLIBFLAGS Flags to pass to objcopy when library objects are
being built. [${.TARGET} =~ "*.po" ? -X : -x]
OBJDUMP Display information from object files. [objdump] OBJDUMP Display information from object files. [objdump]
RANLIB Generate index to archive. [ranlib] RANLIB Generate index to archive. [ranlib]

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.lib.mk,v 1.318 2011/10/07 09:15:22 mrg Exp $ # $NetBSD: bsd.lib.mk,v 1.319 2012/01/28 21:32:14 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk> .include <bsd.init.mk>
@ -214,7 +214,7 @@ CTFFLAGS+= -g
${CTFCONVERT} ${CTFFLAGS} ${.TARGET} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif .endif
.if !defined(CFLAGS) || empty(CFLAGS:M*-g*) .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
${OBJCOPY} -x ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.endif .endif
.c.po: .c.po:
@ -224,7 +224,7 @@ CTFFLAGS+= -g
${CTFCONVERT} ${CTFFLAGS} ${.TARGET} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif .endif
.if !defined(CFLAGS) || empty(CFLAGS:M*-g*) .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
${OBJCOPY} -X ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.endif .endif
.c.go: .c.go:
@ -235,21 +235,21 @@ CTFFLAGS+= -g
${_MKTARGET_COMPILE} ${_MKTARGET_COMPILE}
${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET} ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
.if !defined(CFLAGS) || empty(CFLAGS:M*-g*) .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
${OBJCOPY} -x ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.endif .endif
.cc.o .cpp.o .cxx.o .C.o: .cc.o .cpp.o .cxx.o .C.o:
${_MKTARGET_COMPILE} ${_MKTARGET_COMPILE}
${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} ${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
.if !defined(CFLAGS) || empty(CFLAGS:M*-g*) .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
${OBJCOPY} -x ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.endif .endif
.cc.po .cpp.po .cxx.po .C.po: .cc.po .cpp.po .cxx.po .C.po:
${_MKTARGET_COMPILE} ${_MKTARGET_COMPILE}
${COMPILE.cc} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET} ${COMPILE.cc} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}
.if !defined(CFLAGS) || empty(CFLAGS:M*-g*) .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
${OBJCOPY} -X ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.endif .endif
.cc.go .cpp.go .cxx.go .C.go: .cc.go .cpp.go .cxx.go .C.go:
@ -260,7 +260,7 @@ CTFFLAGS+= -g
${_MKTARGET_COMPILE} ${_MKTARGET_COMPILE}
${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET} ${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
.if !defined(CFLAGS) || empty(CFLAGS:M*-g*) .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
${OBJCOPY} -x ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.endif .endif
.f.o: .f.o:
@ -270,7 +270,7 @@ CTFFLAGS+= -g
${CTFCONVERT} ${CTFFLAGS} ${.TARGET} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif .endif
.if !defined(FOPTS) || empty(FOPTS:M*-g*) .if !defined(FOPTS) || empty(FOPTS:M*-g*)
${OBJCOPY} -x ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.endif .endif
.f.po: .f.po:
@ -280,7 +280,7 @@ CTFFLAGS+= -g
${CTFCONVERT} ${CTFFLAGS} ${.TARGET} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif .endif
.if !defined(FOPTS) || empty(FOPTS:M*-g*) .if !defined(FOPTS) || empty(FOPTS:M*-g*)
${OBJCOPY} -X ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.endif .endif
.f.go: .f.go:
@ -291,7 +291,7 @@ CTFFLAGS+= -g
${_MKTARGET_COMPILE} ${_MKTARGET_COMPILE}
${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET} ${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}
.if !defined(FOPTS) || empty(FOPTS:M*-g*) .if !defined(FOPTS) || empty(FOPTS:M*-g*)
${OBJCOPY} -x ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.endif .endif
.f.ln: .f.ln:
@ -305,7 +305,7 @@ CTFFLAGS+= -g
${CTFCONVERT} ${CTFFLAGS} ${.TARGET} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif .endif
.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*) .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
${OBJCOPY} -x ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.endif .endif
.m.po: .m.po:
@ -315,21 +315,21 @@ CTFFLAGS+= -g
${CTFCONVERT} ${CTFFLAGS} ${.TARGET} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif .endif
.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*) .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
${OBJCOPY} -X ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.endif .endif
.m.go: .m.go:
${_MKTARGET_COMPILE} ${_MKTARGET_COMPILE}
${COMPILE.m} ${DEBUGFLAGS} -g ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} ${COMPILE.m} ${DEBUGFLAGS} -g ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*) .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
${OBJCOPY} -X ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.endif .endif
.m.pico: .m.pico:
${_MKTARGET_COMPILE} ${_MKTARGET_COMPILE}
${COMPILE.m} ${CSHLIBFLAGS} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} ${COMPILE.m} ${CSHLIBFLAGS} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*) .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
${OBJCOPY} -x ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.endif .endif
.s.o: .s.o:
@ -338,7 +338,7 @@ CTFFLAGS+= -g
.if defined(CTFCONVERT) .if defined(CTFCONVERT)
${CTFCONVERT} ${CTFFLAGS} ${.TARGET} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif .endif
${OBJCOPY} -x ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.S.o: .S.o:
${_MKTARGET_COMPILE} ${_MKTARGET_COMPILE}
@ -346,7 +346,7 @@ CTFFLAGS+= -g
.if defined(CTFCONVERT) .if defined(CTFCONVERT)
${CTFCONVERT} ${CTFFLAGS} ${.TARGET} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif .endif
${OBJCOPY} -x ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.s.po: .s.po:
${_MKTARGET_COMPILE} ${_MKTARGET_COMPILE}
@ -354,7 +354,7 @@ CTFFLAGS+= -g
.if defined(CTFCONVERT) .if defined(CTFCONVERT)
${CTFCONVERT} ${CTFFLAGS} ${.TARGET} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif .endif
${OBJCOPY} -X ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.S.po: .S.po:
${_MKTARGET_COMPILE} ${_MKTARGET_COMPILE}
@ -362,7 +362,7 @@ CTFFLAGS+= -g
.if defined(CTFCONVERT) .if defined(CTFCONVERT)
${CTFCONVERT} ${CTFFLAGS} ${.TARGET} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.endif .endif
${OBJCOPY} -X ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.s.go: .s.go:
${_MKTARGET_COMPILE} ${_MKTARGET_COMPILE}
@ -375,12 +375,12 @@ CTFFLAGS+= -g
.s.pico: .s.pico:
${_MKTARGET_COMPILE} ${_MKTARGET_COMPILE}
${COMPILE.s} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} ${COMPILE.s} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
${OBJCOPY} -x ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.S.pico: .S.pico:
${_MKTARGET_COMPILE} ${_MKTARGET_COMPILE}
${COMPILE.S} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} ${COMPILE.S} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
${OBJCOPY} -x ${.TARGET} ${OBJCOPY} ${OBJCOPYFLAGS} ${.TARGET}
.if defined(LIB) # { .if defined(LIB) # {
.if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \ .if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.sys.mk,v 1.210 2011/10/31 14:20:12 chs Exp $ # $NetBSD: bsd.sys.mk,v 1.211 2012/01/28 21:32:14 christos Exp $
# #
# Build definitions used for NetBSD source tree builds. # Build definitions used for NetBSD source tree builds.
@ -268,4 +268,7 @@ YFLAGS+= ${YPREFIX:D-p${YPREFIX}} ${YHEADER:D-d}
.endif .endif
.endif .endif
# Objcopy
OBJCOPYLIBFLAGS?=${"${.TARGET:M*.po}" != "":?-X:-x}
.endif # !defined(_BSD_SYS_MK_) .endif # !defined(_BSD_SYS_MK_)