chaoren created this revision. chaoren added a reviewer: Andrzej. chaoren added a subscriber: lldb-commits. Herald added subscribers: srhines, danalbert, tberghammer.
Adding `-latomic` to `ANDROID_LINKER_FLAGS` doesn't actually work. Adding `atomic` to `LLDB_SYSTEM_LIBS` does. Related: D11831. http://reviews.llvm.org/D11840 Files: cmake/platforms/Android.cmake Index: cmake/platforms/Android.cmake =================================================================== --- cmake/platforms/Android.cmake +++ cmake/platforms/Android.cmake @@ -109,7 +109,11 @@ 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 )
Index: cmake/platforms/Android.cmake =================================================================== --- cmake/platforms/Android.cmake +++ cmake/platforms/Android.cmake @@ -109,7 +109,11 @@ 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 )
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
