diff options
| author | Todd Fiala <todd.fiala@gmail.com> | 2016-08-12 19:27:05 +0000 |
|---|---|---|
| committer | Todd Fiala <todd.fiala@gmail.com> | 2016-08-12 19:27:05 +0000 |
| commit | af32ccb195ece1a25511d1d35d8c14ce1b58ee9b (patch) | |
| tree | 4e8bf3a77475d34f3ef118340084f46db812ce25 /lldb/scripts/Xcode | |
| parent | 3c4d60ad89aa996a48cc53cabb2d4ebab42bee8f (diff) | |
| download | bcm5719-llvm-af32ccb195ece1a25511d1d35d8c14ce1b58ee9b.tar.gz bcm5719-llvm-af32ccb195ece1a25511d1d35d8c14ce1b58ee9b.zip | |
fix lldb-gtest target of Xcode build
Change r278527 was filtering out too many libraries.
The Xcode lldb-gtest target depends on linking libgtest*.a,
but those were not being included. This caused the lldb-gtest
linkage step to fail to find a main entry point that is present
in the filtered out libs.
This change restores the libgtest* libraries to the link list
by whitelisting them in the filter.
llvm-svn: 278552
Diffstat (limited to 'lldb/scripts/Xcode')
| -rwxr-xr-x | lldb/scripts/Xcode/build-llvm.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lldb/scripts/Xcode/build-llvm.py b/lldb/scripts/Xcode/build-llvm.py index e8d1b63d3f0..e7b91bcacc1 100755 --- a/lldb/scripts/Xcode/build-llvm.py +++ b/lldb/scripts/Xcode/build-llvm.py @@ -134,7 +134,7 @@ def CMAKE_ENVIRONMENT (): def collect_archives_in_path (path): files = os.listdir(path) # Only use libclang and libLLVM archives, and exclude libclang_rt - regexp = "^lib(clang[^_]|LLVM).*$" + regexp = "^lib(clang[^_]|LLVM|gtest).*$" return [os.path.join(path, file) for file in files if file.endswith(".a") and re.match(regexp, file)] def archive_list (): |
