On Sun, Jan 22, 2017 at 01:06:54PM +1100, Jonathan Gray wrote:
> gnu/usr.bin/clang/Makefile.inc sets CC based on BOOTSTRAP_CLANG, most
> local llvm Makefiles include bsd.own.mk which picks up mk.conf
> definitions, these few don't which breaks the build when BOOTSTRAP_CLANG
> is set in mk.conf instead of the environment.

ok

> 
> Index: clang/Makefile
> ===================================================================
> RCS file: /cvs/src/gnu/usr.bin/clang/clang/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- clang/Makefile    14 Jan 2017 20:12:41 -0000      1.2
> +++ clang/Makefile    22 Jan 2017 02:00:43 -0000
> @@ -1,5 +1,7 @@
>  # $OpenBSD: Makefile,v 1.2 2017/01/14 20:12:41 patrick Exp $
>  
> +.include <bsd.own.mk>
> +
>  PROG=        clang
>  BINDIR=      /usr/bin
>  SRCS=        driver.cpp \
> Index: clang-tblgen/Makefile
> ===================================================================
> RCS file: /cvs/src/gnu/usr.bin/clang/clang-tblgen/Makefile,v
> retrieving revision 1.1
> diff -u -p -r1.1 Makefile
> --- clang-tblgen/Makefile     5 Sep 2016 10:56:48 -0000       1.1
> +++ clang-tblgen/Makefile     22 Jan 2017 02:00:43 -0000
> @@ -6,6 +6,7 @@ NOMAN=
>  LDADD+=      -ltermlib
>  DPADD+=      ${LIBTERMLIB}
>  
> +.include <bsd.own.mk>
>  SRCS=        ClangASTNodesEmitter.cpp \
>       ClangAttrEmitter.cpp \
>       ClangCommentCommandInfoEmitter.cpp \
> Index: llvm-tblgen/Makefile
> ===================================================================
> RCS file: /cvs/src/gnu/usr.bin/clang/llvm-tblgen/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- llvm-tblgen/Makefile      14 Jan 2017 20:12:42 -0000      1.2
> +++ llvm-tblgen/Makefile      22 Jan 2017 02:00:43 -0000
> @@ -6,6 +6,7 @@ NOMAN=
>  LDADD+=      -ltermlib
>  DPADD+=      ${LIBTERMLIB}
>  
> +.include <bsd.own.mk>
>  SRCS=        AsmMatcherEmitter.cpp \
>       AsmWriterEmitter.cpp \
>       AsmWriterInst.cpp \
> 

Reply via email to