d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert change (r322952) that was not yet destined for ^/head

Browse Source 
This unbreaks the build.

This happened because of a botched "svn switch".

Reported by:	cem
This commit is contained in:
Enji Cooper 2017-08-27 17:08:08 +00:00
parent b5197de15e
commit 9a1f7ce50c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=322953
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
share/mk/bsd.lib.mk
View File

@ -76,13 +76,6 @@ CTFFLAGS+= -g
.include <bsd.libnames.mk>
.if ${MK_COVERAGE} != "no" && (!empty(CFLAGS:M-g*) || !empty(CXXFLAGS:M-g*))
_COV_FLAG= --coverage
CFLAGS+= ${_COV_FLAG}
CXXFLAGS+= ${_COV_FLAG}
.error "foo"
.endif
# prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
# .pico used for PIC object files
.SUFFIXES: .out .o .bc .ll .po .pico .S .asm .s .c .cc .cpp .cxx .C .f .y .l .ln
@ -102,14 +95,14 @@ PO_FLAG=-pg
${CTFCONVERT_CMD}
.c.pico:
${CC} ${PICFLAG} -DPIC ${PO_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
${CTFCONVERT_CMD}
.cc.po .C.po .cpp.po .cxx.po:
${CXX} ${PO_FLAG} ${STATIC_CXXFLAGS} ${PO_CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
.cc.pico .C.pico .cpp.pico .cxx.pico:
${CXX} ${PICFLAG} -DPIC ${PO_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
${CXX} ${PICFLAG} -DPIC ${SHARED_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
.f.po:
${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC}
@ -149,12 +142,6 @@ _SHLIBDIR:=${SHLIBDIR}
.if defined(SHLIB_NAME)
.if ${MK_DEBUG_FILES} != "no"
SHLIB_NAME_FULL=${SHLIB_NAME}.full
.if ${MK_COVERAGE} != "no"
COVERAGEFILEDIR=${COVERAGEDIR}${_SHLIBDIR}
.if !exists(${DESTDIR}${COVERAGEFILEDIR})
COVERAGEMKDIR=
.endif
.endif
# Use ${DEBUGDIR} for base system debug files, else .debug subdirectory
.if ${_SHLIBDIR} == "/boot" ||\
${SHLIBDIR:C%/lib(/.*)?$%/lib%} == "/lib" ||\
@ -234,9 +221,6 @@ CLEANFILES+= ${SOBJS}
.if defined(SHLIB_NAME)
_LIBS+= ${SHLIB_NAME}
.if !empty(_COV_FLAG)
SOLINKOPTS+= ${_COV_FLAG}
.endif
SOLINKOPTS+= -shared -Wl,-x
.if defined(LD_FATAL_WARNINGS) && ${LD_FATAL_WARNINGS} == "no"
SOLINKOPTS+= -Wl,--no-fatal-warnings
@ -376,14 +360,6 @@ _libinstall:
${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/
.if ${MK_DEBUG_FILES} != "no"
.if ${MK_COVERAGE} != "no"
.if defined(COVERAGEMKDIR)
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -d ${DESTDIR}${COVERAGEFILEDIR}/
.endif
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} \
${SHLIB_NAME}.full ${DESTDIR}${COVERAGEFILEDIR}/${SHLIB_NAME}
.endif
.if defined(DEBUGMKDIR)
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},debug} -d ${DESTDIR}${DEBUGFILEDIR}/
.endif
@ -435,11 +411,6 @@ _libinstall:
.if !defined(LIBRARIES_ONLY)
.include <bsd.nls.mk>
.if defined(_COV_FLAG)
COV_OBJS= ${OBJS}
COV_SRCS= ${SRCS:M*.[c|cc|cpp|cxx|C]}
.include <bsd.cov.mk>
.endif
.include <bsd.files.mk>
.include <bsd.incs.mk>
.include <bsd.confs.mk>