summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2017-02-16 02:08:42 +0000
committerjsg <jsg@openbsd.org>2017-02-16 02:08:42 +0000
commit4d99aea954328cf442eedf1b33958bf3b0d72b0b (patch)
treebc1a938a195bf936e82459cff555ac4510178e65
parentBring parse_warn() into the log.[ch] 21st century and adopt the "^" (diff)
downloadwireguard-openbsd-4d99aea954328cf442eedf1b33958bf3b0d72b0b.tar.xz
wireguard-openbsd-4d99aea954328cf442eedf1b33958bf3b0d72b0b.zip
clang is installed as cc and c++ there is no need to set CC and CXX to
clang and clang++.
-rw-r--r--gnu/usr.bin/clang/Makefile.inc5
-rw-r--r--lib/libcxx/Makefile5
-rw-r--r--lib/libcxxabi/Makefile5
3 files changed, 3 insertions, 12 deletions
diff --git a/gnu/usr.bin/clang/Makefile.inc b/gnu/usr.bin/clang/Makefile.inc
index f73b997f746..1229abfe8f7 100644
--- a/gnu/usr.bin/clang/Makefile.inc
+++ b/gnu/usr.bin/clang/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.3 2016/12/20 07:32:18 patrick Exp $
+# $OpenBSD: Makefile.inc,v 1.4 2017/02/16 02:08:42 jsg Exp $
LLVM_SRCS?= ${.CURDIR}/../../../llvm
@@ -6,9 +6,6 @@ BOOTSTRAP_CLANG?=no
.if ${BOOTSTRAP_CLANG} == "yes"
CC= egcc
CXX= eg++
-.else
-CC= clang
-CXX= clang++
.endif
DEBUG=
diff --git a/lib/libcxx/Makefile b/lib/libcxx/Makefile
index 4930eaf851c..91cb529249b 100644
--- a/lib/libcxx/Makefile
+++ b/lib/libcxx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2017/01/20 07:55:20 patrick Exp $
+# $OpenBSD: Makefile,v 1.5 2017/02/16 02:08:42 jsg Exp $
.include <bsd.own.mk>
@@ -12,9 +12,6 @@ CXXINCLUDEDIR= /usr/include/c++/v1
.PATH: ${SRCDIR}
-CC= clang
-CXX= clang++
-
LIB= c++
SRCS+= algorithm.cpp\
diff --git a/lib/libcxxabi/Makefile b/lib/libcxxabi/Makefile
index 9ffa9113b5a..5ca9386d611 100644
--- a/lib/libcxxabi/Makefile
+++ b/lib/libcxxabi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2017/01/20 07:55:20 patrick Exp $
+# $OpenBSD: Makefile,v 1.6 2017/02/16 02:08:42 jsg Exp $
.include <bsd.own.mk>
@@ -12,9 +12,6 @@ CXXINCLUDEDIR= /usr/include/c++/v1
.PATH: ${SRCDIR} ${.CURDIR}/../libunwind/src
-CC= clang
-CXX= clang++
-
LIB= c++abi
SRCS+= abort_message.cpp\