MFstable/11 r305910:

MFC r305033,r305041,r305170:

r305033:

Minor Makefile simplifications for lib/atf/...

- Replace uses of `${.CURDIR:H:H:H}` with ${SRCTOP}
- Use built-in :H operator instead of ".." when enumerating paths.

r305041:

Filter certain compile-time options into -DATF_BUILD_*

Items filtered through are:

- Constant defines (-D)
- Include flags (-I)
- Linker flags (-L)
- Optimization level (-O)
- Warnings / linker flags (-W)
- Preprocessor options (-f)

This fixes the scenario hit by the Jenkins job where it's infecting
the build with --sysroot, etc options from the Jenkins build in the
tests.

Prefix all intermediate variables (_CFLAGS, etc) with "ATF_BUILD" [*].

Requested by:	jmmv

r305170:

Don't bake all of CC/CPP/CXX into CFLAGS

Capture executable names for CC, CPP, CXX (assumed to be the
first non-CCACHE_BIN word).

This change strips out all of the cross-compiler arguments, (-target,
-B, etc), added to ${CC}, etc via ${CROSSENV} in Makefile.inc1, so it
doesn't infect the build and subsequently the test.

Add comments noting why this logic is being added, and why the logic in
r305041 was necessary/what it was trying to achieve.

This is required after recent changes made to the toolchain to always
specify --sysroot, -target, -B, etc with clang in buildworld (presumably
r304681).

2 files changed, 25 insertions, 13 deletions

diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
index ea8434d..caffdca 100644
--- a/lib/atf/libatf-c++/Makefile
+++ b/lib/atf/libatf-c++/Makefile
@@ -35,15 +35,15 @@ SHLIB_MAJOR=	2
 DPADD=		${LIBATF_C}
 LDADD=		-latf-c
 
-LDFLAGS+=	-L${.OBJDIR}/../libatf-c
+LDFLAGS+=	-L${.OBJDIR:H}/libatf-c
 
-ATF=		${.CURDIR:H:H:H}/contrib/atf
+ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}
 .PATH:		${ATF}/atf-c++
 .PATH:		${ATF}/atf-c++/detail
 
 CFLAGS+=	-I${ATF}
-CFLAGS+=	-I${.CURDIR}/../libatf-c
+CFLAGS+=	-I${.CURDIR:H}/libatf-c
 CFLAGS+=	-I.
 
 CFLAGS+=	-DHAVE_CONFIG_H
diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile
index 858bbf7..6a0e88b 100644
--- a/lib/atf/libatf-c/Makefile
+++ b/lib/atf/libatf-c/Makefile
@@ -27,25 +27,37 @@
 
 .include <bsd.init.mk>
 
-_CFLAGS:=	${CFLAGS}
-_CPPFLAGS:=	${CPPFLAGS}
-_CXXFLAGS:=	${CXXFLAGS}
+# Store the toolchain executable in ATF_BUILD_{CC,CPP,CXX} to ensure other
+# values -- like -target, -B ..., etc -- don't get leaked into the tests.
+#
+# Be sure to omit ${CCACHE_BIN} (if specified) from the variable as it gets
+# automatically appended to the variables in bsd.compiler.mk when
+# ${MK_CCACHE_BUILD} != no.
+ATF_BUILD_CC:=		${CC:N${CCACHE_BIN}:[1]}
+ATF_BUILD_CPP:=		${CPP:N${CCACHE_BIN}:[1]}
+ATF_BUILD_CXX:=		${CXX:N${CCACHE_BIN}:[1]}
+
+# Only capture defines, includes, linker flags, optimization levels, warnings
+# and preprocessor flags when building ATF_BUILD_{C,CPP,CXX}FLAGS.
+ATF_BUILD_CFLAGS:=	${CFLAGS:M-[DILOWf]*}
+ATF_BUILD_CPPFLAGS:=	${CPPFLAGS:M-[DILOWf]*}
+ATF_BUILD_CXXFLAGS:=	${CXXFLAGS:M-[DILOWf]*}
 
 LIB=		atf-c
 PRIVATELIB=	true
 SHLIB_MAJOR=	1
 
-ATF=		${.CURDIR:H:H:H}/contrib/atf
+ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}
 .PATH:		${ATF}/atf-c
 .PATH:		${ATF}/atf-c/detail
 
-CFLAGS+=	-DATF_BUILD_CC='"${CC}"'
-CFLAGS+=	-DATF_BUILD_CFLAGS='"${_CFLAGS}"'
-CFLAGS+=	-DATF_BUILD_CPP='"${CPP}"'
-CFLAGS+=	-DATF_BUILD_CPPFLAGS='"${_CPPFLAGS}"'
-CFLAGS+=	-DATF_BUILD_CXX='"${CXX}"'
-CFLAGS+=	-DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"'
+CFLAGS+=	-DATF_BUILD_CC='"${ATF_BUILD_CC}"'
+CFLAGS+=	-DATF_BUILD_CFLAGS='"${ATF_BUILD_CFLAGS}"'
+CFLAGS+=	-DATF_BUILD_CPP='"${ATF_BUILD_CPP}"'
+CFLAGS+=	-DATF_BUILD_CPPFLAGS='"${ATF_BUILD_CPPFLAGS}"'
+CFLAGS+=	-DATF_BUILD_CXX='"${ATF_BUILD_CXX}"'
+CFLAGS+=	-DATF_BUILD_CXXFLAGS='"${ATF_BUILD_CXXFLAGS}"'
 CFLAGS+=	-I${ATF}
 CFLAGS+=	-I${.CURDIR}
 CFLAGS+=	-I.