aboutsummaryrefslogtreecommitdiffstats
path: root/main/llvm
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-08-31 05:30:00 +0000
committerTimo Teräs <timo.teras@iki.fi>2015-08-31 05:30:00 +0000
commit3acc2c98f38b44e40dfba15cfad4cec3753d5807 (patch)
tree0ab4a5f923df7fa613fdc7808112ee52b7301385 /main/llvm
parentf10434640de3727d363237e28408c4c9dc1f1114 (diff)
downloadaports-3acc2c98f38b44e40dfba15cfad4cec3753d5807.tar.bz2
aports-3acc2c98f38b44e40dfba15cfad4cec3753d5807.tar.xz
main/llvm: no need to install bootstrap compiler
and keep the bootstrap compiler for debugging it if something goes wrong during self-build
Diffstat (limited to 'main/llvm')
-rw-r--r--main/llvm/APKBUILD19
1 files changed, 6 insertions, 13 deletions
diff --git a/main/llvm/APKBUILD b/main/llvm/APKBUILD
index 1166f0f64c..ce33eba8ed 100644
--- a/main/llvm/APKBUILD
+++ b/main/llvm/APKBUILD
@@ -44,8 +44,7 @@ fi
_builddir="$srcdir"/build
-_bootstrap_prefix="$srcdir"/bootstrap
-
+_bootstrapdir="$srcdir"/bootstrap
_cmake_flags="\
-DCMAKE_BUILD_TYPE=Release \
@@ -83,7 +82,6 @@ _cmake_common_flags="\
# built as part of the default target).
_cmake_bootstrap_flags="\
${_cmake_common_flags} \
- -DCMAKE_INSTALL_PREFIX=${_bootstrap_prefix} \
-DLLVM_TARGETS_TO_BUILD=host \
-DBUILD_SHARED_LIBS=NO \
-DCLANG_ENABLE_ARCMT=NO \
@@ -230,8 +228,8 @@ build() {
ffi_include_dir="$(pkg-config --cflags-only-I libffi | sed 's|^-I||g')"
- mkdir -p "$_builddir"
- cd "$_builddir"
+ mkdir -p "$_bootstrapdir" "$_builddir"
+ cd "$_bootstrapdir"
msg "Compiling bootstrap compiler"
cmake -G "Unix Makefiles" -Wno-dev ${_cmake_bootstrap_flags} \
@@ -250,17 +248,12 @@ build() {
paxmark m bin/lli
paxmark m bin/lli-child-target
- make install || return 1
-
cflags="${orig_cflags} -DNDEBUG"
cxxflags="${orig_cxxflags} -DNDEBUG"
- CC="${_bootstrap_prefix}/bin/clang"
- CXX="${_bootstrap_prefix}/bin/clang++"
+ CC="${_bootstrapdir}/bin/clang"
+ CXX="${_bootstrapdir}/bin/clang++"
- cd ..
- rm -rf "$_builddir"
- mkdir -p "$_builddir"
- cd "$_builddir"
+ cd ../"$_builddir"
msg "Compiling final compiler"
cmake -G "Unix Makefiles" -Wno-dev ${_cmake_final_flags} \