summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/clang/Makefile.common8
-rw-r--r--lang/libLLVM/Makefile8
-rw-r--r--lang/llvm/Makefile8
3 files changed, 6 insertions, 18 deletions
diff --git a/lang/clang/Makefile.common b/lang/clang/Makefile.common
index a403d830ca3..4c30b4e0146 100644
--- a/lang/clang/Makefile.common
+++ b/lang/clang/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2017/03/17 22:38:17 adam Exp $
+# $NetBSD: Makefile.common,v 1.20 2017/05/03 08:38:43 jperkin Exp $
# used by lang/clang/Makefile
# used by lang/clang-static-analyzer/Makefile
@@ -17,7 +17,7 @@ PATCHDIR= ${.CURDIR}/../../lang/clang/patches
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++11
USE_CMAKE= yes
GCC_REQD+= 4.8
@@ -115,10 +115,6 @@ CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
CMAKE_ARGS+= -DCLANG_INCLUDE_TESTS=OFF
.endif
-# At least LLVM 3.9.0 and subprojects don't correctly add C++11 flags
-# automatically.
-CXXFLAGS+= -std=c++11
-
post-extract:
${RUN} mkdir -p ${WRKDIR}/build
diff --git a/lang/libLLVM/Makefile b/lang/libLLVM/Makefile
index 2bb8288823b..5d58561736e 100644
--- a/lang/libLLVM/Makefile
+++ b/lang/libLLVM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2017/05/01 00:43:07 maya Exp $
+# $NetBSD: Makefile,v 1.23 2017/05/03 08:38:43 jperkin Exp $
DISTNAME= llvm-4.0.0.src
PKGNAME= ${DISTNAME:S/llvm/libLLVM/:S/.src//}
@@ -12,7 +12,7 @@ HOMEPAGE= http://llvm.org/
COMMENT= Low Level Virtual Machine shared library
LICENSE= modified-bsd
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++11
USE_CMAKE= yes
GCC_REQD+= 4.8
PYTHON_FOR_BUILD_ONLY= yes
@@ -112,10 +112,6 @@ PLIST_SUBST+= LLVM_LIBNAME=${LLVM_LIBNAME}
.include "options.mk"
-# At least LLVM 3.9.0 and subprojects don't correctly add C++11 flags
-# automatically.
-CXXFLAGS+= -std=c++11
-
# needs std::atomic with 64-bit CAS
.if ${MACHINE_ARCH} == "i386"
CXXFLAGS+= -march=i586
diff --git a/lang/llvm/Makefile b/lang/llvm/Makefile
index c01318ac733..7c787319729 100644
--- a/lang/llvm/Makefile
+++ b/lang/llvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2017/05/01 00:41:29 maya Exp $
+# $NetBSD: Makefile,v 1.19 2017/05/03 08:38:43 jperkin Exp $
#
# when updating this, please also update:
# devel/include-what-you-use
@@ -21,7 +21,7 @@ HOMEPAGE= http://llvm.org/
COMMENT= Low Level Virtual Machine compiler infrastructure
LICENSE= modified-bsd
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++11
USE_CMAKE= yes
GCC_REQD+= 4.8
PYTHON_FOR_BUILD_ONLY= yes
@@ -103,10 +103,6 @@ PLIST.notdylib= yes
.endif
PLIST_SUBST+= SOEXT=${SOEXT}
-# At least LLVM 3.9.0 and subprojects don't correctly add C++11 flags
-# automatically.
-CXXFLAGS+= -std=c++11
-
# needs std::atomic with 64-bit CAS
.if ${MACHINE_ARCH} == "i386"
CXXFLAGS+= -march=i586