diff options
| author | Chaoren Lin <chaorenl@google.com> | 2015-08-07 18:54:02 +0000 |
|---|---|---|
| committer | Chaoren Lin <chaorenl@google.com> | 2015-08-07 18:54:02 +0000 |
| commit | d47fb197f608a8034bee1cc875e843e1558863a6 (patch) | |
| tree | 8434d3820d0938bb41a496a1fdf0202b997c33fa | |
| parent | e173314d39bfb571cde4a5ae497bed7d2285e660 (diff) | |
| download | bcm5719-llvm-d47fb197f608a8034bee1cc875e843e1558863a6.tar.gz bcm5719-llvm-d47fb197f608a8034bee1cc875e843e1558863a6.zip | |
Update to D11825.
Summary:
Adding `-latomic` to `ANDROID_LINKER_FLAGS` doesn't actually work.
Adding `atomic` to `LLDB_SYSTEM_LIBS` does.
Related: D11831.
Reviewers: Andrzej, ovyalov
Subscribers: tberghammer, danalbert, srhines, lldb-commits
Differential Revision: http://reviews.llvm.org/D11840
llvm-svn: 244343
| -rw-r--r-- | lldb/cmake/platforms/Android.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lldb/cmake/platforms/Android.cmake b/lldb/cmake/platforms/Android.cmake index af93051bbf2..bf3a6321ef1 100644 --- a/lldb/cmake/platforms/Android.cmake +++ b/lldb/cmake/platforms/Android.cmake @@ -109,7 +109,11 @@ elseif( ANDROID_ABI STREQUAL "armeabi" ) endif() elseif( ANDROID_ABI STREQUAL "mips" ) # http://b.android.com/182094 - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -latomic" ) + list( FIND LLDB_SYSTEM_LIBS atomic index ) + if( index EQUAL -1 ) + list( APPEND LLDB_SYSTEM_LIBS atomic ) + set( LLDB_SYSTEM_LIBS ${LLDB_SYSTEM_LIBS} CACHE INTERNAL "" FORCE ) + endif() endif() if( NOT LLVM_BUILD_STATIC ) |
