From 792948a31a3d6312279f4e13077a1a5c3e523e9b Mon Sep 17 00:00:00 2001 From: pascal Date: Mon, 17 Apr 2017 19:58:53 +0000 Subject: [PATCH] Take a more radical approach to disabling colours: pretend we don't HAVE_TERMINFO in our local config.h. Some of the lower levels of LLVM don't seem to respect our default setting. As a result, delete the -ltermlib dependency. Note that this breaks -fcolor-diagnostics=auto. However, fixing the whole codebase is out of scope for now ... Prompted by an instance found in the AsmParser by deraadt@ ok kettenis@ patrick@ --- gnu/usr.bin/clang/clang-tblgen/Makefile | 5 +---- gnu/usr.bin/clang/clang/Makefile | 5 +---- gnu/usr.bin/clang/include/llvm/Config/config.h | 2 +- gnu/usr.bin/clang/llc/Makefile | 5 +---- gnu/usr.bin/clang/lld/Makefile | 5 +---- gnu/usr.bin/clang/llvm-tblgen/Makefile | 5 +---- 6 files changed, 6 insertions(+), 21 deletions(-) diff --git a/gnu/usr.bin/clang/clang-tblgen/Makefile b/gnu/usr.bin/clang/clang-tblgen/Makefile index 471242b1f09..59fff2f6f7e 100644 --- a/gnu/usr.bin/clang/clang-tblgen/Makefile +++ b/gnu/usr.bin/clang/clang-tblgen/Makefile @@ -1,11 +1,8 @@ -# $OpenBSD: Makefile,v 1.2 2017/01/22 03:56:33 jsg Exp $ +# $OpenBSD: Makefile,v 1.3 2017/04/17 19:58:53 pascal Exp $ PROG= clang-tblgen NOMAN= -LDADD+= -ltermlib -DPADD+= ${LIBTERMLIB} - .include SRCS= ClangASTNodesEmitter.cpp \ ClangAttrEmitter.cpp \ diff --git a/gnu/usr.bin/clang/clang/Makefile b/gnu/usr.bin/clang/clang/Makefile index a4c0d025201..42ef8d24716 100644 --- a/gnu/usr.bin/clang/clang/Makefile +++ b/gnu/usr.bin/clang/clang/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2017/03/27 15:32:38 kettenis Exp $ +# $OpenBSD: Makefile,v 1.8 2017/04/17 19:58:53 pascal Exp $ .include @@ -9,9 +9,6 @@ SRCS= driver.cpp \ cc1_main.cpp \ cc1as_main.cpp -LDADD+= -ltermlib -DPADD+= ${LIBTERMLIB} - LINKS= ${BINDIR}/clang ${BINDIR}/clang++ \ ${BINDIR}/clang ${BINDIR}/clang-cpp MLINKS= clang.1 clang++.1 \ diff --git a/gnu/usr.bin/clang/include/llvm/Config/config.h b/gnu/usr.bin/clang/include/llvm/Config/config.h index 517f8a2b9c9..6defc8a9cb9 100644 --- a/gnu/usr.bin/clang/include/llvm/Config/config.h +++ b/gnu/usr.bin/clang/include/llvm/Config/config.h @@ -242,7 +242,7 @@ #define HAVE_SYS_UIO_H 1 /* Define if the setupterm() function is supported this platform. */ -#define HAVE_TERMINFO 1 +/* #undef HAVE_TERMINFO */ /* Define if the xar_open() function is supported this platform. */ /* #undef HAVE_LIBXAR */ diff --git a/gnu/usr.bin/clang/llc/Makefile b/gnu/usr.bin/clang/llc/Makefile index cd67d48e7ea..7d631e67c2c 100644 --- a/gnu/usr.bin/clang/llc/Makefile +++ b/gnu/usr.bin/clang/llc/Makefile @@ -1,11 +1,8 @@ -# $OpenBSD: Makefile,v 1.1 2016/09/05 10:56:50 pascal Exp $ +# $OpenBSD: Makefile,v 1.2 2017/04/17 19:58:53 pascal Exp $ PROG= llc NOMAN= -LDADD+= -ltermlib -DPADD+= ${LIBTERMLIB} - SRCS= llc.cpp .PATH: ${.CURDIR}/../../../llvm/tools/llc diff --git a/gnu/usr.bin/clang/lld/Makefile b/gnu/usr.bin/clang/lld/Makefile index f068790dc0d..fed25eac6ff 100644 --- a/gnu/usr.bin/clang/lld/Makefile +++ b/gnu/usr.bin/clang/lld/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2017/03/27 15:32:38 kettenis Exp $ +# $OpenBSD: Makefile,v 1.8 2017/04/17 19:58:53 pascal Exp $ .include @@ -7,9 +7,6 @@ BINDIR= /usr/bin SRCS= lld.cpp NOMAN= -LDADD+= -ltermlib -DPADD+= ${LIBTERMLIB} - .if ${COMPILER_VERSION:L} == "clang" LINKS= ${BINDIR}/ld.lld ${BINDIR}/ld .endif diff --git a/gnu/usr.bin/clang/llvm-tblgen/Makefile b/gnu/usr.bin/clang/llvm-tblgen/Makefile index 9db6e76df6d..3ec7a1d7cd1 100644 --- a/gnu/usr.bin/clang/llvm-tblgen/Makefile +++ b/gnu/usr.bin/clang/llvm-tblgen/Makefile @@ -1,11 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 2017/01/24 08:44:47 patrick Exp $ +# $OpenBSD: Makefile,v 1.5 2017/04/17 19:58:53 pascal Exp $ PROG= llvm-tblgen NOMAN= -LDADD+= -ltermlib -DPADD+= ${LIBTERMLIB} - .include SRCS= AsmMatcherEmitter.cpp \ AsmWriterEmitter.cpp \ -- 2.20.1