svn commit: r359681 - in head: . share/mk
Antoine Brodin
antoine at freebsd.org
Tue Apr 7 05:40:32 UTC 2020
On Tue, Apr 7, 2020 at 1:38 AM Brooks Davis <brooks at freebsd.org> wrote:
>
> Author: brooks
> Date: Mon Apr 6 23:38:46 2020
> New Revision: 359681
> URL: https://svnweb.freebsd.org/changeset/base/359681
>
> Log:
> Fix compilation with upstream clang builtin headers.
>
> By using -nobuiltininc and adding the clang builtin headers resource dir
> to the end of the compiler header search path, we can still find headers
> such as immintrin.h but find the FreeBSD version of stddef.h/stdarg.h/..
> first.
>
> This is a workaround until we are able to settle on and complete a plan
> to harmonize guard macros with LLVM. We've mostly worked out this on
> FreeBSD systems by removing select headers from the installed set of
> devel/llvm*, but that isn't a good solution for cross build.
>
> Submitted by: arichardson
> Obtained from: CheriBSD
> Sponsored by: DARPA, AFRL
> Differential Revision: https://reviews.freebsd.org/D17002
>
> Modified:
> head/Makefile.inc1
> head/share/mk/bsd.compiler.mk
> head/share/mk/bsd.sys.mk
>
This breaks ports:
make[1]: "/usr/share/mk/bsd.sys.mk" line 219: Malformed conditional
(${MK_CLANG_BOOTSTRAP} == "no" && ${COMPILER_RESOURCE_DIR} !=
"unknown" && !defined(BOOTSTRAPPING))
Antoine
More information about the svn-src-head
mailing list