From 7fe7e8ecfa6e38498b6e3edcac9bd6c145357765 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 5 Feb 2018 12:32:18 -0800 Subject: Fix libc++.a linker script for arm32. Using libc++ on arm32 involves using the LLVM unwinder, which depends on libdl. Test: ./run_tests.py --rebuild Bug: None Change-Id: I428474c0c13bec87881d08bc1728efd40090fd4a --- sources/cxx-stl/llvm-libc++/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sources') diff --git a/sources/cxx-stl/llvm-libc++/build.py b/sources/cxx-stl/llvm-libc++/build.py index cd60c026d..a9679a02e 100755 --- a/sources/cxx-stl/llvm-libc++/build.py +++ b/sources/cxx-stl/llvm-libc++/build.py @@ -116,7 +116,7 @@ def main(args): # other support libraries appropriately. static_libs = ['-lc++_static', '-lc++abi', '-landroid_support'] if is_arm: - static_libs.extend(['-lunwind', '-latomic']) + static_libs.extend(['-lunwind', '-ldl', '-latomic']) make_linker_script(os.path.join(install_dir, 'libc++.a'), static_libs) shared_libs = ['-landroid_support'] -- cgit v1.2.3