diff options
| author | bapt <bapt@FreeBSD.org> | 2014-08-06 22:17:26 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-08-06 22:17:26 +0000 |
| commit | 8a9380f42cca5e897a1ccdfa1d7a4d0e624e4864 (patch) | |
| tree | 55e479f80b3d04d5fd6accb8908787cccd17d895 /libexec | |
| parent | 8b0ef17c97fe79b895e87452fef5f810ade727fd (diff) | |
| download | FreeBSD-src-8a9380f42cca5e897a1ccdfa1d7a4d0e624e4864.zip FreeBSD-src-8a9380f42cca5e897a1ccdfa1d7a4d0e624e4864.tar.gz | |
Rework privatelib/internallib
Make sure everything linking to a privatelib and/or an internallib does it directly
from the OBJDIR rather than DESTDIR.
Add src.libnames.mk so bsd.libnames.mk is not polluted by libraries not existsing
in final installation
Introduce the LD* variable which is what ld(1) is expecting (via LDADD) to link to
internal/privatelib
Directly link to the .so in case of private library to avoid having to complexify
LDFLAGS.
Phabric: https://phabric.freebsd.org/D553
Reviewed by: imp, emaste
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/atf/atf-check/Makefile | 4 | ||||
| -rw-r--r-- | libexec/atf/atf-sh/Makefile | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile index fa7fabe..a36d94d 100644 --- a/libexec/atf/atf-check/Makefile +++ b/libexec/atf/atf-check/Makefile @@ -37,10 +37,8 @@ MAN= atf-check.1 CFLAGS+= -I${ATF} -LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c++ -LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c DPADD+= ${LIBATF_CXX} ${LIBATF_C} -LDADD+= -latf-c++ -latf-c +LDADD+= ${LDATF_CXX} ${LDATF_C} USEPRIVATELIB= atf-c++ atf-c .if ${MK_TESTS} != "no" diff --git a/libexec/atf/atf-sh/Makefile b/libexec/atf/atf-sh/Makefile index 3f461fd..90a780c 100644 --- a/libexec/atf/atf-sh/Makefile +++ b/libexec/atf/atf-sh/Makefile @@ -39,7 +39,7 @@ CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -I${ATF} DPADD+= ${LIBATF_C} ${LIBATF_CXX} -LDADD+= -latf-c++ -latf-c +LDADD+= ${LDATF_C} ${LDATF_CXX} USEPRIVATELIB= atf-c++ atf-c FILESGROUPS= SUBR |
