mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 12:54:27 +00:00
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" [*]. MFC after: 2 weeks Reported by: Jenkins Requested by: jmmv Reviewed by: jmmv Sponsored by: EMC / Isilon Storage Division Differential Revision: https://reviews.freebsd.org/D7702
This commit is contained in:
parent
e150821a8c
commit
e6f1b41e4e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=305041
|
@ -28,9 +28,9 @@
|
|||
.include <src.opts.mk>
|
||||
.include <bsd.init.mk>
|
||||
|
||||
_CFLAGS:= ${CFLAGS}
|
||||
_CPPFLAGS:= ${CPPFLAGS}
|
||||
_CXXFLAGS:= ${CXXFLAGS}
|
||||
ATF_BUILD_CFLAGS:= ${CFLAGS:M-[DILOWf]*}
|
||||
ATF_BUILD_CPPFLAGS:= ${CPPFLAGS:M-[DILOWf]*}
|
||||
ATF_BUILD_CXXFLAGS:= ${CXXFLAGS:M-[DILOWf]*}
|
||||
|
||||
LIB= atf-c
|
||||
PRIVATELIB= true
|
||||
|
@ -42,11 +42,11 @@ ATF= ${SRCTOP}/contrib/atf
|
|||
.PATH: ${ATF}/atf-c/detail
|
||||
|
||||
CFLAGS+= -DATF_BUILD_CC='"${CC}"'
|
||||
CFLAGS+= -DATF_BUILD_CFLAGS='"${_CFLAGS}"'
|
||||
CFLAGS+= -DATF_BUILD_CFLAGS='"${ATF_BUILD_CFLAGS}"'
|
||||
CFLAGS+= -DATF_BUILD_CPP='"${CPP}"'
|
||||
CFLAGS+= -DATF_BUILD_CPPFLAGS='"${_CPPFLAGS}"'
|
||||
CFLAGS+= -DATF_BUILD_CPPFLAGS='"${ATF_BUILD_CPPFLAGS}"'
|
||||
CFLAGS+= -DATF_BUILD_CXX='"${CXX}"'
|
||||
CFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"'
|
||||
CFLAGS+= -DATF_BUILD_CXXFLAGS='"${ATF_BUILD_CXXFLAGS}"'
|
||||
CFLAGS+= -I${ATF}
|
||||
CFLAGS+= -I${.CURDIR}
|
||||
CFLAGS+= -I.
|
||||
|
|
Loading…
Reference in a new issue