[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.347 and 1.368.2.1

version 1.347, 2014/03/02 22:22:05 version 1.368.2.1, 2017/04/21 16:53:20
Line 42  realinstall: checkver libinstall
Line 42  realinstall: checkver libinstall
 # XXX: This is needed for programs that link with .a libraries  # XXX: This is needed for programs that link with .a libraries
 # Perhaps a more correct solution is to always generate _pic.a  # Perhaps a more correct solution is to always generate _pic.a
 # files or always have a shared library.  # files or always have a shared library.
 .if defined(MKPIE) && (${MKPIE} != "no")  # XXX: This breaks profiling (__mcount relocation is wrong)
   .if defined(MKPIE) && (${MKPIE} != "no") && !defined(NOPIE)
 CFLAGS+=        ${PIE_CFLAGS}  CFLAGS+=        ${PIE_CFLAGS}
 AFLAGS+=        ${PIE_AFLAGS}  AFLAGS+=        ${PIE_AFLAGS}
 .endif  .endif
Line 64  DPADD+=  ${LIBDO.${_lib}}/lib${_lib}.so 
Line 65  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 156  MKSHLIBOBJS= yes
Line 157  MKSHLIBOBJS= yes
 MKSHLIBOBJS= no  MKSHLIBOBJS= no
 .endif  .endif
   
 .if (defined(MKDEBUG) && (${MKDEBUG} != "no")) || \  .if (${MKDEBUG:Uno} != "no" && !defined(NODEBUG)) || \
     (defined(CFLAGS) && !empty(CFLAGS:M*-g*))      (defined(CFLAGS) && !empty(CFLAGS:M*-g*))
 # We only add -g to the shared library objects  # We only add -g to the shared library objects
 # because we don't currently split .a archives.  # because we don't currently split .a archives.
Line 169  CFLAGS+= -g
Line 170  CFLAGS+= -g
 # 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"  .if !defined(SHLIB_MKMAP) || ${SHLIB_MKMAP} != "no"
 SHLIB_SHFLAGS+=         -Wl,-Map=${_LIB}.so.${SHLIB_SOVERSION}.map  SHLIB_SHFLAGS+=         -Wl,-Map=${_LIB}.so.${SHLIB_SOVERSION}.map
 .endif  .endif
Line 185  FFLAGS+= ${FOPTS}
Line 188  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  .if defined(HAVE_GCC)
 CFLAGS+=        -gdwarf-2  #CFLAGS+=       -gdwarf-2
 .endif  .endif
 .endif  .endif
 .endif  .endif
Line 404  _LIB.ln:=llib-l${LIB}.ln
Line 407  _LIB.ln:=llib-l${LIB}.ln
 _LIB.so:=${_LIB}.so  _LIB.so:=${_LIB}.so
 _LIB.so.major:=${_LIB}.so.${SHLIB_MAJOR}  _LIB.so.major:=${_LIB}.so.${SHLIB_MAJOR}
 _LIB.so.full:=${_LIB}.so.${SHLIB_FULLVERSION}  _LIB.so.full:=${_LIB}.so.${SHLIB_FULLVERSION}
 .if ${MKDEBUG} != "no"  _LIB.so.link:=${_LIB}.so.${SHLIB_FULLVERSION}.link
   .if ${MKDEBUG:Uno} != "no" && !defined(NODEBUG)
 _LIB.so.debug:=${_LIB.so.full}.debug  _LIB.so.debug:=${_LIB.so.full}.debug
 .endif  .endif
 .endif  .endif
Line 442  ${_LIB}_combine.o: ${COMBINESRCS}
Line 446  ${_LIB}_combine.o: ${COMBINESRCS}
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.c} -MD --combine ${.ALLSRC} -o ${.TARGET}          ${COMPILE.c} -MD --combine ${.ALLSRC} -o ${.TARGET}
 .if defined(LIBSTRIPOBJS)  .if defined(LIBSTRIPOBJS)
         ${OBJCOPY} -x ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
 CLEANFILES+=    ${_LIB}_combine.d  CLEANFILES+=    ${_LIB}_combine.d
Line 521  _YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YH
Line 525  _YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YH
   
 realall: ${SRCS} ${ALLOBJS:O} ${_LIBS} ${_LIB.so.debug}  realall: ${SRCS} ${ALLOBJS:O} ${_LIBS} ${_LIB.so.debug}
   
 MKARZERO?= ${MKREPRO:Uno}  
   
 .if ${MKARZERO} == "yes"  .if ${MKARZERO} == "yes"
 _ARFL=crsD  _ARFL=crsD
 _ARRANFL=sD  _ARRANFL=sD
Line 575  _LIBLDOPTS+= -Wl,-rpath,${SHLIBDIR} \
Line 577  _LIBLDOPTS+= -Wl,-rpath,${SHLIBDIR} \
 _LIBLDOPTS+=    -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \  _LIBLDOPTS+=    -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \
                 -L=${SHLIBINSTALLDIR}                  -L=${SHLIBINSTALLDIR}
 .endif  .endif
   .if ${MKSTRIPSYM:Uyes} == "yes"
   _LIBLDOPTS+=    -Wl,-x
   .else
   _LIBLDOPTS+=    -Wl,-X
   .endif
   
 # gcc -shared now adds -lc automatically. For libraries other than libc and  # gcc -shared now adds -lc automatically. For libraries other than libc and
 # libgcc* we add as a dependency the installed shared libc. For libc and  # libgcc* we add as a dependency the installed shared libc. For libc and
Line 602  LDADD+= -lgcc
Line 609  LDADD+= -lgcc
 LIBCC:= ${CXX}  LIBCC:= ${CXX}
 . if ${MKLIBCXX} == "yes"  . if ${MKLIBCXX} == "yes"
 LIBDPLIBS+=     c++     ${.CURDIR}/../../../../../external/bsd/libc++/lib  LIBDPLIBS+=     c++     ${.CURDIR}/../../../../../external/bsd/libc++/lib
 . elif defined(HAVE_GCC) && ${HAVE_GCC} == 4  
 LIBDPLIBS+=     stdc++  ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4  
 . else  . else
 LIBDPLIBS+=     stdc++  ${.CURDIR}/../../../../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3  LIBDPLIBS+=     stdc++  ${.CURDIR}/../../../../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
 . endif  . endif
Line 614  LIBCC:= ${CC}
Line 619  LIBCC:= ${CC}
 _LDADD.${_LIB}= ${LDADD} ${LDADD.${_LIB}}  _LDADD.${_LIB}= ${LDADD} ${LDADD.${_LIB}}
 _LDFLAGS.${_LIB}=       ${LDFLAGS} ${LDFLAGS.${_LIB}}  _LDFLAGS.${_LIB}=       ${LDFLAGS} ${LDFLAGS.${_LIB}}
   
 ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPLIBC} \  _MAINLIBDEPS=   ${SOLIB} ${DPADD} ${DPLIBC} \
     ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}                  ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
   
   .if defined(_LIB.so.debug)
   ${_LIB.so.debug}: ${_LIB.so.link}
           ${_MKTARGET_CREATE}
           (  ${OBJCOPY} --only-keep-debug \
                   ${_LIB.so.link} ${_LIB.so.debug} \
           ) || (rm -f ${.TARGET}; false)
   ${_LIB.so.full}: ${_LIB.so.link} ${_LIB.so.debug}
           ${_MKTARGET_CREATE}
           (  ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \
                   --add-gnu-debuglink=${_LIB.so.debug} \
                   ${_LIB.so.link} ${_LIB.so.full} \
           ) || (rm -f ${.TARGET}; false)
   ${_LIB.so.link}: ${_MAINLIBDEPS}
   .else # aka no MKDEBUG
   ${_LIB.so.full}: ${_MAINLIBDEPS}
   .endif
         ${_MKTARGET_BUILD}          ${_MKTARGET_BUILD}
         rm -f ${.TARGET}          rm -f ${.TARGET}
         ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} \          ${LIBCC} ${LDLIBC} -shared ${SHLIB_SHFLAGS} \
             ${_LDFLAGS.${_LIB}} -o ${.TARGET} ${_LIBLDOPTS} \              ${_LDFLAGS.${_LIB}} -o ${.TARGET} ${_LIBLDOPTS} \
             -Wl,--whole-archive ${SOLIB} \              -Wl,--whole-archive ${SOLIB} \
             -Wl,--no-whole-archive ${_LDADD.${_LIB}}              -Wl,--no-whole-archive ${_LDADD.${_LIB}}
 #  We don't use INSTALL_SYMLINK here because this is just  #  We don't use INSTALL_SYMLINK here because this is just
 #  happening inside the build directory/objdir. XXX Why does  #  happening inside the build directory/objdir. XXX Why does
 #  this spend so much effort on libraries that aren't live??? XXX  #  this spend so much effort on libraries that aren't live??? XXX
   #  XXX Also creates dead symlinks until the .full rule runs
   #  above and creates the main link
 .if defined(SHLIB_FULLVERSION) && defined(SHLIB_MAJOR) && \  .if defined(SHLIB_FULLVERSION) && defined(SHLIB_MAJOR) && \
     "${SHLIB_FULLVERSION}" != "${SHLIB_MAJOR}"      "${SHLIB_FULLVERSION}" != "${SHLIB_MAJOR}"
         ${HOST_LN} -sf ${_LIB.so.full} ${_LIB.so.major}.tmp          ${HOST_LN} -sf ${_LIB.so.full} ${_LIB.so.major}.tmp
Line 636  ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPL
Line 660  ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPL
         ${OBJCOPY} -R .ident ${.TARGET}          ${OBJCOPY} -R .ident ${.TARGET}
 .endif  .endif
   
 .if defined(_LIB.so.debug)  
 ${_LIB.so.debug}: ${_LIB.so.full}  
         ${_MKTARGET_CREATE}  
         (  ${OBJCOPY} --only-keep-debug ${_LIB.so.full} ${_LIB.so.debug} \  
         && ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \  
                 --add-gnu-debuglink=${_LIB.so.debug} ${_LIB.so.full} \  
         ) || (rm -f ${.TARGET}; false)  
 .endif  
   
 .if !empty(LOBJS)                                                       # {  .if !empty(LOBJS)                                                       # {
 LLIBS?=         -lc  LLIBS?=         -lc
 ${_LIB.ln}: ${LOBJS}  ${_LIB.ln}: ${LOBJS}

Legend:
Removed from v.1.347  
changed lines
  Added in v.1.368.2.1

CVSweb <webmaster@jp.NetBSD.org>