diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2015-04-08 08:55:49 -0700 |
|---|---|---|
| committer | Pirama Arumuga Nainar <pirama@google.com> | 2015-04-09 15:04:38 -0700 |
| commit | 4c5e43da7792f75567b693105cc53e3f1992ad98 (patch) | |
| tree | 1b2c9792582e12f5af0b1512e3094425f0dc0df9 /projects | |
| parent | c75239e6119d0f9a74c57099d91cbc9bde56bf33 (diff) | |
| download | external_llvm-4c5e43da7792f75567b693105cc53e3f1992ad98.zip external_llvm-4c5e43da7792f75567b693105cc53e3f1992ad98.tar.gz external_llvm-4c5e43da7792f75567b693105cc53e3f1992ad98.tar.bz2 | |
Update aosp/master llvm for rebase to r233350
Change-Id: I07d935f8793ee8ec6b7da003f6483046594bca49
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index 8d244fd..428ce84 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -19,8 +19,10 @@ if(${LLVM_BUILD_RUNTIME}) # MSVC isn't quite working with libc++ yet, disable it until issues are # fixed. if(NOT MSVC) - add_llvm_external_project(libcxx) + # libc++ uses the libc++abi target names so libc++abi should be added + # first. add_llvm_external_project(libcxxabi) + add_llvm_external_project(libcxx) endif() if(NOT LLVM_BUILD_EXTERNAL_COMPILER_RT) add_llvm_external_project(compiler-rt) |