summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-02-05 22:34:29 +0000
committerdim <dim@FreeBSD.org>2015-02-05 22:34:29 +0000
commitd2b9c88b24f95cd9f8e7bd621cfa454ce759c687 (patch)
treef694c1cf8b05138d26e736cf19e8c23cb6cfa832 /lib
parentbd558a3f75de913bd9b0752eb936f1ce14a5e117 (diff)
parent49ba8ceb19505a0e0d49b2b436526bf135193ef9 (diff)
downloadFreeBSD-src-d2b9c88b24f95cd9f8e7bd621cfa454ce759c687.zip
FreeBSD-src-d2b9c88b24f95cd9f8e7bd621cfa454ce759c687.tar.gz
Merging ^/head r278224 through r278297.
Diffstat (limited to 'lib')
-rw-r--r--lib/clang/clang.build.mk3
-rw-r--r--lib/csu/powerpc64/Makefile3
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index d58d3ae..a3fae12 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -34,7 +34,8 @@ BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/armv6hf/armv6/:C/arm64/aarch64/}-u
CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
-CXXFLAGS+= -std=c++11 -stdlib=libc++ -fno-exceptions -fno-rtti
+CXXFLAGS+= -std=c++11 -fno-exceptions -fno-rtti
+CXXFLAGS.clang+= -stdlib=libc++
.PATH: ${LLVM_SRCS}/${SRCDIR}
diff --git a/lib/csu/powerpc64/Makefile b/lib/csu/powerpc64/Makefile
index 123391e..dd6e9fb 100644
--- a/lib/csu/powerpc64/Makefile
+++ b/lib/csu/powerpc64/Makefile
@@ -9,6 +9,9 @@ CFLAGS+= -I${.CURDIR}/../common \
-I${.CURDIR}/../../libc/include \
-mlongcall
+CC:= gcc
+COMPILER_TYPE:= gcc
+
all: ${OBJS}
CLEANFILES= ${OBJS}
OpenPOWER on IntegriCloud