summaryrefslogtreecommitdiffstats
path: root/lldb/scripts/Xcode/build-llvm.py
diff options
context:
space:
mode:
authorTodd Fiala <todd.fiala@gmail.com>2016-08-12 17:01:19 +0000
committerTodd Fiala <todd.fiala@gmail.com>2016-08-12 17:01:19 +0000
commit1dc065b659cc2b45b750b3773cbf7331289bf9e9 (patch)
tree3745e8050f428ffc1ce148be6d0dca1993294965 /lldb/scripts/Xcode/build-llvm.py
parentbd22bf26cb0d98f9f40dfbb9f8407da1e19044df (diff)
downloadbcm5719-llvm-1dc065b659cc2b45b750b3773cbf7331289bf9e9.tar.gz
bcm5719-llvm-1dc065b659cc2b45b750b3773cbf7331289bf9e9.zip
Link LLDB only against libclang and libLLVM .a files to fix macOS build
The Xcode macOS build of LLDB is currently broken after https://reviews.llvm.org/D23232 landed, see http://lab.llvm.org:8080/green/job/lldb_build_test/20014/console, because we’re trying to link against all .a files found in the llvm-build/lib directory. Let’s be more specific in what we link against. This patch applies a regexp to only use “libclang.*”, “libLLVM.*” and not “libclang_rt.*” static archives. Change by Kuba Mracek (formerly Kuba Brecka) See review here: https://reviews.llvm.org/D23444 Reviewers: tfiala, compnerd llvm-svn: 278527
Diffstat (limited to 'lldb/scripts/Xcode/build-llvm.py')
-rwxr-xr-xlldb/scripts/Xcode/build-llvm.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lldb/scripts/Xcode/build-llvm.py b/lldb/scripts/Xcode/build-llvm.py
index b594a8cfe17..e8d1b63d3f0 100755
--- a/lldb/scripts/Xcode/build-llvm.py
+++ b/lldb/scripts/Xcode/build-llvm.py
@@ -5,6 +5,7 @@ import hashlib
import fnmatch
import os
import platform
+import re
import subprocess
import sys
@@ -132,7 +133,9 @@ def CMAKE_ENVIRONMENT ():
def collect_archives_in_path (path):
files = os.listdir(path)
- return [os.path.join(path, file) for file in files if file.endswith(".a")]
+ # Only use libclang and libLLVM archives, and exclude libclang_rt
+ regexp = "^lib(clang[^_]|LLVM).*$"
+ return [os.path.join(path, file) for file in files if file.endswith(".a") and re.match(regexp, file)]
def archive_list ():
paths = library_paths()
OpenPOWER on IntegriCloud