Sync

build-llvm.py

@@ -701,11 +701,17 @@ def project_target_cmake_defines(args, stage):
             defines['COMPILER_RT_BUILD_SANITIZERS'] = 'OFF'
         # Make compiler-rt the default runtime library for clang
         defines['CLANG_DEFAULT_RTLIB'] = 'compiler-rt'
+        if not "libcxx" in projects:
+            defines['COMPILER_RT_USE_LIBCXX'] = 'OFF'
 
     if "libunwind" in projects:
         # Make libunwind the default unwind library for clang
         defines['CLANG_DEFAULT_UNWINDLIB'] = 'libunwind'
 
+    if "lld" in projects:
+        # Make ld.lld the default linker for clang
+        defines['CLANG_DEFAULT_LINKER'] = 'lld'
+
     return defines
 
 

build-tc.sh

@@ -12,10 +12,11 @@ function msg() {
 msg "Building LLVM..."
 ./build-llvm.py \
 	--clang-vendor "LiuNian-$(date +%Y%m%d)" \
-	--projects "clang;compiler-rt;libunwind;lld;polly" \
+	--projects "clang;lld;polly" \
 	--targets "ARM;AArch64;X86" \
 	--update \
 	--incremental \
+	--use-good-revision \
 	--build-stage1-only \
 	--install-stage1-only \
 	--install-folder "installTmp" \
@@ -24,8 +25,8 @@ msg "Building LLVM..."
 # Build binutils
 msg "Building binutils..."
 ccacheBin=$(which ccache)
-test $(which gcc) && export CC="${ccacheBin} gcc"
-test $(which g++) && export CXX="${ccacheBin} g++"
+test $(which clang) && export CC="${ccacheBin} clang"
+test $(which clang++) && export CXX="${ccacheBin} clang++"
 ./build-binutils.py \
 	--targets arm aarch64 x86_64 \
 	--install-folder "installTmp"