summaryrefslogtreecommitdiffstats
path: root/main/llvm
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-05-22 13:43:08 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-05-22 13:43:08 +0000
commit95623fb7c14e2129b8e4f39e947d99dc85d3e158 (patch)
tree01d279a6a2c6859074d4b3045f851c2e36de13db /main/llvm
parentf38ff631e3623c3a1f8983ae906c86d6c10258a3 (diff)
downloadaports-95623fb7c14e2129b8e4f39e947d99dc85d3e158.tar.bz2
aports-95623fb7c14e2129b8e4f39e947d99dc85d3e158.tar.xz
Revert "main/llvm: fix build with ccache and pax kernel"
Diffstat (limited to 'main/llvm')
-rw-r--r--main/llvm/APKBUILD9
1 files changed, 5 insertions, 4 deletions
diff --git a/main/llvm/APKBUILD b/main/llvm/APKBUILD
index 9e6d6b901..c5fdc8e28 100644
--- a/main/llvm/APKBUILD
+++ b/main/llvm/APKBUILD
@@ -214,6 +214,8 @@ build() {
CFLAGS=""
CXXFLAGS="-fno-devirtualize"
LDFLAGS=""
+ : ${CC:=$(which gcc)}
+ : ${CXX:=$(which g++)}
# The cmake logic appears to use the result of config.guess in a few places
# even though we override the various triple settings manually. export CBUILD
@@ -225,6 +227,8 @@ build() {
msg "Compiling bootstrap compiler"
cmake -G "Unix Makefiles" -Wno-dev ${_cmake_bootstrap_flags} \
+ -DCMAKE_C_COMPILER="${CC}" \
+ -DCMAKE_CXX_COMPILER="${CXX}" \
-DCMAKE_C_FLAGS="${CFLAGS}" \
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
@@ -255,10 +259,7 @@ build() {
"${_srcdir}" || return 1
make || return 1
-
- # llvm cheks fails on PaX kernels
- # make check-llvm || return 1
-
+ make check-llvm || return 1
make check-clang || return 1
# 27 failures, all related to clang-tidy
# make check-clang-tools || return 1