[BACK]Return to bsd.lib.mk CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / share / mk

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/share/mk/bsd.lib.mk between version 1.330 and 1.357

version 1.330, 2013/02/09 17:18:17 version 1.357, 2015/06/02 23:00:25
Line 47  CFLAGS+=        ${PIE_CFLAGS}
Line 47  CFLAGS+=        ${PIE_CFLAGS}
 AFLAGS+=        ${PIE_AFLAGS}  AFLAGS+=        ${PIE_AFLAGS}
 .endif  .endif
   
 .if defined(MKDEBUG) && (${MKDEBUG} != "no")  
 # We only add -g to the shared library objects  
 # because we don't currently split .a archives.  
 CSHLIBFLAGS+=   -g  
 .endif  
   
 ##### Libraries that this may depend upon.  ##### Libraries that this may depend upon.
 .if defined(LIBDPLIBS) && ${MKPIC} != "no"                              # {  .if defined(LIBDPLIBS) && ${MKPIC} != "no"                              # {
 .for _lib _dir in ${LIBDPLIBS}  .for _lib _dir in ${LIBDPLIBS}
Line 70  DPADD+=  ${LIBDO.${_lib}}/lib${_lib}.so 
Line 64  DPADD+=  ${LIBDO.${_lib}}/lib${_lib}.so 
 .endif                                                                  # }  .endif                                                                  # }
   
 ##### Build and install rules  ##### Build and install rules
 MKDEP_SUFFIXES?=        .o .po .pico .go .ln  MKDEP_SUFFIXES?=        .o .po .pico .go .ln .d
   
 .if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE})              # {  .if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE})              # {
 SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major  SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major
Line 135  SHLIB_FULLVERSION=${SHLIB_MAJOR}
Line 129  SHLIB_FULLVERSION=${SHLIB_MAJOR}
   
   
 # Set PICFLAGS to cc flags for producing position-independent code,  # Set PICFLAGS to cc flags for producing position-independent code,
 # if not already set.  Includes -DPIC, if required.  # if not already set.
   
 # Data-driven table using make variables to control how shared libraries  # Data-driven table using make variables to control how shared libraries
 # are built for different platforms and object formats.  # are built for different platforms and object formats.
Line 149  SHLIB_FULLVERSION=${SHLIB_MAJOR}
Line 143  SHLIB_FULLVERSION=${SHLIB_MAJOR}
 #                       with ELF, also set shared-lib version for ld.so.  #                       with ELF, also set shared-lib version for ld.so.
 # SHLIB_LDSTARTFILE:    support .o file, call C++ file-level constructors  # SHLIB_LDSTARTFILE:    support .o file, call C++ file-level constructors
 # SHLIB_LDENDFILE:      support .o file, call C++ file-level destructors  # SHLIB_LDENDFILE:      support .o file, call C++ file-level destructors
 # FPICFLAGS:            flags for ${FC} to compile .[fF] files to .pico objects.  
 # CPPPICFLAGS:          flags for ${CPP} to preprocess .[sS] files for ${AS}  
 # CPICFLAGS:            flags for ${CC} to compile .[cC] files to pic objects.  
 # CSHLIBFLAGS:          flags for ${CC} to compile .[cC] files to .pico objects.  
 #                       (usually includes ${CPICFLAGS})  
 # CAPICFLAGS:           flags for ${CC} to compiling .[Ss] files  
 #                       (usually just ${CPPPICFLAGS} ${CPICFLAGS})  
 # APICFLAGS:            flags for ${AS} to assemble .[sS] to .pico objects.  
   
 .if ${MACHINE_ARCH} == "alpha"                                          # {  
   
 FPICFLAGS ?= -fPIC  
 CPICFLAGS ?= -fPIC -DPIC  
 CPPPICFLAGS?= -DPIC  
 CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}  
 APICFLAGS ?=  
   
 .elif (${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64")      # } {  
   
 # If you use -fPIC you need to define BIGPIC to turn on 32-bit  
 # relocations in asm code  
 FPICFLAGS ?= -fPIC  
 CPICFLAGS ?= -fPIC -DPIC  
 CPPPICFLAGS?= -DPIC -DBIGPIC  
 CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}  
 APICFLAGS ?= -KPIC  
   
 .else                                                                   # } {  
   
 # Platform-independent flags for NetBSD shared libraries  
 SHLIB_SOVERSION=${SHLIB_FULLVERSION}  
 SHLIB_SHFLAGS=  
 FPICFLAGS ?= -fPIC  
 CPICFLAGS?= -fPIC -DPIC  
 CPPPICFLAGS?= -DPIC  
 CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}  
 APICFLAGS?= -k  
   
 .endif                                                                  # }  PICFLAGS ?= -fPIC
   
 .if ${MKPICLIB} != "no"  .if ${MKPICLIB} != "no"
 CSHLIBFLAGS+= ${CPICFLAGS}  CSHLIBFLAGS+= ${PICFLAGS}
 .endif  .endif
   
 .if defined(CSHLIBFLAGS) && !empty(CSHLIBFLAGS)  .if defined(CSHLIBFLAGS) && !empty(CSHLIBFLAGS)
Line 199  MKSHLIBOBJS= yes
Line 156  MKSHLIBOBJS= yes
 MKSHLIBOBJS= no  MKSHLIBOBJS= no
 .endif  .endif
   
   .if (defined(MKDEBUG) && (${MKDEBUG} != "no")) || \
       (defined(CFLAGS) && !empty(CFLAGS:M*-g*))
   # We only add -g to the shared library objects
   # because we don't currently split .a archives.
   CSHLIBFLAGS+=   -g
   .if ${LIBISPRIVATE} == "yes"
   CFLAGS+=        -g
   .endif
   .endif
   
 # Platform-independent linker flags for ELF shared libraries  # Platform-independent linker flags for ELF shared libraries
 SHLIB_SOVERSION=        ${SHLIB_MAJOR}  SHLIB_SOVERSION=        ${SHLIB_MAJOR}
 SHLIB_SHFLAGS=          -Wl,-soname,${_LIB}.so.${SHLIB_SOVERSION}  SHLIB_SHFLAGS=          -Wl,-soname,${_LIB}.so.${SHLIB_SOVERSION}
   .if !defined(SHLIB_WARNTEXTREL) || ${SHLIB_WARNTEXTREL} != "no"
 SHLIB_SHFLAGS+=         -Wl,--warn-shared-textrel  SHLIB_SHFLAGS+=         -Wl,--warn-shared-textrel
   .endif
   .if !defined(SHLIB_MKMAP) || ${SHLIB_MKMAP} != "no"
   SHLIB_SHFLAGS+=         -Wl,-Map=${_LIB}.so.${SHLIB_SOVERSION}.map
   .endif
   CLEANFILES+=            ${_LIB}.so.${SHLIB_SOVERSION}.map
 SHLIB_LDSTARTFILE?=     ${_GCC_CRTI} ${_GCC_CRTBEGINS}  SHLIB_LDSTARTFILE?=     ${_GCC_CRTI} ${_GCC_CRTBEGINS}
 SHLIB_LDENDFILE?=       ${_GCC_CRTENDS} ${_GCC_CRTN}  SHLIB_LDENDFILE?=       ${_GCC_CRTENDS} ${_GCC_CRTN}
   
Line 214  FFLAGS+= ${FOPTS}
Line 187  FFLAGS+= ${FOPTS}
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
 .if defined(CFLAGS) && !empty(CFLAGS:M*-g*)  .if defined(CFLAGS) && !empty(CFLAGS:M*-g*)
 CTFFLAGS+=      -g  CTFFLAGS+=      -g
   .if defined(HAVE_GCC) && ${HAVE_GCC} >= 48
   #CFLAGS+=       -gdwarf-2
   .endif
   .endif
   .endif
   
   LIBSTRIPAOBJS=  yes
   .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
   LIBSTRIPCOBJS=  yes
   .endif
   .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
   LIBSTRIPOBJCOBJS=       yes
 .endif  .endif
   .if !defined(FFLAGS) || empty(FFLAGS:M*-g*)
   LIBSTRIPFOBJS=  yes
   .endif
   .if !defined(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*)
   LIBSTRIPSHLIBOBJS=      yes
 .endif  .endif
   
 .c.o:  .c.o:
Line 223  CTFFLAGS+= -g
Line 213  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
 .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)  .if defined(LIBSTRIPCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 233  CTFFLAGS+= -g
Line 223  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
 .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)  .if defined(LIBSTRIPCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 244  CTFFLAGS+= -g
Line 234  CTFFLAGS+= -g
 .c.pico:  .c.pico:
         ${_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(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*)  .if defined(LIBSTRIPSHLIBOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.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(LIBSTRIPCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.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(LIBSTRIPCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 269  CTFFLAGS+= -g
Line 259  CTFFLAGS+= -g
 .cc.pico .cpp.pico .cxx.pico .C.pico:  .cc.pico .cpp.pico .cxx.pico .C.pico:
         ${_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(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*)  .if defined(LIBSTRIPSHLIBOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 279  CTFFLAGS+= -g
Line 269  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
 .if !defined(FOPTS) || empty(FOPTS:M*-g*)  .if defined(LIBSTRIPFOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 289  CTFFLAGS+= -g
Line 279  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
 .if !defined(FOPTS) || empty(FOPTS:M*-g*)  .if defined(LIBSTRIPFOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 299  CTFFLAGS+= -g
Line 289  CTFFLAGS+= -g
   
 .f.pico:  .f.pico:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.f} ${PICFLAGS} ${.IMPSRC} -o ${.TARGET}
 .if !defined(FOPTS) || empty(FOPTS:M*-g*)  .if defined(LIBSTRIPFOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 314  CTFFLAGS+= -g
Line 304  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
 .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)  .if defined(LIBSTRIPOBJCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 324  CTFFLAGS+= -g
Line 314  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
 .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)  .if defined(LIBSTRIPOBJCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.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(LIBSTRIPOBJCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.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(LIBSTRIPOBJCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 348  CTFFLAGS+= -g
Line 338  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
   .if defined(LIBSTRIPAOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
   .endif
   
 .S.o:  .S.o:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
Line 356  CTFFLAGS+= -g
Line 348  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
   .if defined(LIBSTRIPAOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
   .endif
   
 .s.po:  .s.po:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
Line 364  CTFFLAGS+= -g
Line 358  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
   .if defined(LIBSTRIPAOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
   .endif
   
 .S.po:  .S.po:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
Line 372  CTFFLAGS+= -g
Line 368  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
   .if defined(LIBSTRIPAOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
   .endif
   
 .s.go:  .s.go:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
Line 384  CTFFLAGS+= -g
Line 382  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} ${PICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
   .if defined(LIBSTRIPAOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
   .endif
   
 .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} ${PICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
   .if defined(LIBSTRIPAOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
   .endif
   
 # Declare a few variables to make our life easier later.  # Declare a few variables to make our life easier later.
 _LIB:=${_LIB_PREFIX}${LIB}  _LIB:=${_LIB_PREFIX}${LIB}
Line 413  _DEST.LIB:=${DESTDIR}${LIBDIR}
Line 415  _DEST.LIB:=${DESTDIR}${LIBDIR}
 _DEST.OBJ:=${DESTDIR}${_LIBSODIR}  _DEST.OBJ:=${DESTDIR}${_LIBSODIR}
 _DEST.LINT:=${DESTDIR}${LINTLIBDIR}  _DEST.LINT:=${DESTDIR}${LINTLIBDIR}
 _DEST.DEBUG:=${DESTDIR}${DEBUGDIR}${LIBDIR}  _DEST.DEBUG:=${DESTDIR}${DEBUGDIR}${LIBDIR}
   _DEST.ODEBUG:=${DESTDIR}${DEBUGDIR}${_LIBSODIR}
   
 .if defined(LIB)                                                        # {  .if defined(LIB)                                                        # {
 .if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \  .if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
Line 440  OBJS+=  ${_LIB}_combine.o
Line 443  OBJS+=  ${_LIB}_combine.o
 ${_LIB}_combine.o: ${COMBINESRCS}  ${_LIB}_combine.o: ${COMBINESRCS}
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.c} -MD --combine ${.ALLSRC} -o ${.TARGET}          ${COMPILE.c} -MD --combine ${.ALLSRC} -o ${.TARGET}
 .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)  .if defined(LIBSTRIPOBJS)
         ${OBJCOPY} -x ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
 CLEANFILES+=    ${_LIB}_combine.d  CLEANFILES+=    ${_LIB}_combine.d
Line 520  _YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YH
Line 523  _YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YH
   
 realall: ${SRCS} ${ALLOBJS:O} ${_LIBS} ${_LIB.so.debug}  realall: ${SRCS} ${ALLOBJS:O} ${_LIBS} ${_LIB.so.debug}
   
 MKARZERO?=no  MKARZERO?= ${MKREPRO:Uno}
   
 .if ${MKARZERO} == "yes"  .if ${MKARZERO} == "yes"
 _ARFL=crsD  _ARFL=crsD
Line 591  DPLIBC ?= ${DESTDIR}${LIBC_SO}
Line 594  DPLIBC ?= ${DESTDIR}${LIBC_SO}
 .endif  .endif
 .else  .else
 LDLIBC ?= -nodefaultlibs  LDLIBC ?= -nodefaultlibs
 .if ${LIB} == "c"  .if ${HAVE_LIBGCC} == "yes" && ${LIB} == "c"
 LDADD+= -lgcc  LDADD+= -lgcc
 .endif  .endif
 .endif  .endif
Line 599  LDADD+= -lgcc
Line 602  LDADD+= -lgcc
   
 .if ${LIBISCXX} != "no"  .if ${LIBISCXX} != "no"
 LIBCC:= ${CXX}  LIBCC:= ${CXX}
   . if ${MKLIBCXX} == "yes"
   LIBDPLIBS+=     c++     ${.CURDIR}/../../../../../external/bsd/libc++/lib
   . else
   LIBDPLIBS+=     stdc++  ${.CURDIR}/../../../../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
   . endif
 .else  .else
 LIBCC:= ${CC}  LIBCC:= ${CC}
 .endif  .endif
Line 633  ${_LIB.so.debug}: ${_LIB.so.full}
Line 641  ${_LIB.so.debug}: ${_LIB.so.full}
         ${_MKTARGET_CREATE}          ${_MKTARGET_CREATE}
         (  ${OBJCOPY} --only-keep-debug ${_LIB.so.full} ${_LIB.so.debug} \          (  ${OBJCOPY} --only-keep-debug ${_LIB.so.full} ${_LIB.so.debug} \
         && ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \          && ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \
                 --add-gnu-debuglink=${_LIB.so.debug} ${_LIB.so.full} \              --add-gnu-debuglink=${_LIB.so.debug} ${_LIB.so.full} \
               ${_LIB.so.full}.tmp && mv -f ${_LIB.so.full}.tmp ${_LIB.so.full} \
         ) || (rm -f ${.TARGET}; false)          ) || (rm -f ${.TARGET}; false)
 .endif  .endif
   
Line 744  libinstall:: ${_DEST.LIB}/${_LIB_pic.a}
Line 753  libinstall:: ${_DEST.LIB}/${_LIB_pic.a}
 ${_DEST.LIB}/${_LIB_pic.a}! .MADE  ${_DEST.LIB}/${_LIB_pic.a}! .MADE
 .endif  .endif
 .if ${MKPICLIB} == "no"  .if ${MKPICLIB} == "no"
 ${_DEST.LIB}/${_LIB_pic.a}! ${_LIB_pic.a} __archivesymlinkpic  ${_DEST.LIB}/${_LIB_pic.a}! ${_LIB.a} __archivesymlinkpic
 .else  .else
 ${_DEST.LIB}/${_LIB_pic.a}! ${_LIB_pic.a} __archiveinstall  ${_DEST.LIB}/${_LIB_pic.a}! ${_LIB_pic.a} __archiveinstall
 .endif  .endif
Line 753  ${_DEST.LIB}/${_LIB_pic.a}! ${_LIB_pic.a
Line 762  ${_DEST.LIB}/${_LIB_pic.a}! ${_LIB_pic.a
 ${_DEST.LIB}/${_LIB_pic.a}: .MADE  ${_DEST.LIB}/${_LIB_pic.a}: .MADE
 .endif  .endif
 .if ${MKPICLIB} == "no"  .if ${MKPICLIB} == "no"
 ${_DEST.LIB}/${_LIB_pic.a}: ${_LIB_pic.a} __archivesymlinkpic  ${_DEST.LIB}/${_LIB_pic.a}: ${_LIB.a} __archivesymlinkpic
 .else  .else
 ${_DEST.LIB}/${_LIB_pic.a}: ${_LIB_pic.a} __archiveinstall  ${_DEST.LIB}/${_LIB_pic.a}: ${_LIB_pic.a} __archiveinstall
 .endif  .endif
Line 808  ${_DEST.DEBUG}/${_LIB.so.debug}: ${_LIB.
Line 817  ${_DEST.DEBUG}/${_LIB.so.debug}: ${_LIB.
         ${_MKTARGET_INSTALL}          ${_MKTARGET_INSTALL}
         ${INSTALL_FILE} -o ${DEBUGOWN} -g ${DEBUGGRP} -m ${DEBUGMODE} \          ${INSTALL_FILE} -o ${DEBUGOWN} -g ${DEBUGGRP} -m ${DEBUGMODE} \
             ${.ALLSRC} ${.TARGET}              ${.ALLSRC} ${.TARGET}
   .if ${_LIBSODIR} != ${LIBDIR}
           ${INSTALL_SYMLINK} -l r ${_DEST.DEBUG}/${_LIB.so.debug} \
               ${_DEST.ODEBUG}/${_LIB.so.debug}
   .endif
 .endif  .endif
   
 .if ${MKLINT} != "no" && !empty(LOBJS)  .if ${MKLINT} != "no" && !empty(LOBJS)

Legend:
Removed from v.1.330  
changed lines
  Added in v.1.357

CVSweb <webmaster@jp.NetBSD.org>