diff --git a/build/android/android.toolchain.cmake b/build/android/android.toolchain.cmake index 7a39b3da..3476ce67 100644 --- a/build/android/android.toolchain.cmake +++ b/build/android/android.toolchain.cmake @@ -1301,10 +1301,10 @@ endif() # add crt object to executable link list for Android SDK build # ---------------------------------------------------------------------------- -#set( ANDROID_CRT_BEGIN "${ANDROID_SYSROOT}/usr/lib/crtbegin_dynamic.o") -#set( ANDROID_CRT_END "${ANDROID_SYSROOT}/usr/lib/crtend_android.o") -#set( CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE} ${ANDROID_CRT_BEGIN} ${ANDROID_CRT_END}" ) -#set( CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${ANDROID_CRT_BEGIN} ${ANDROID_CRT_END}" ) +set( ANDROID_CRT_BEGIN "${ANDROID_SYSROOT}/usr/lib/crtbegin_dynamic.o") +set( ANDROID_CRT_END "${ANDROID_SYSROOT}/usr/lib/crtend_android.o") +set( CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE} ${ANDROID_CRT_BEGIN} ${ANDROID_CRT_END}" ) +set( CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${ANDROID_CRT_BEGIN} ${ANDROID_CRT_END}" ) # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- @@ -1406,7 +1406,7 @@ endif() # ---------------------------------------------------------------------------- # add nostdlib for Android SDK build # ---------------------------------------------------------------------------- -set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib -ldl" ) +set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib -ldl -lc" ) # cache flags set( CMAKE_CXX_FLAGS "" CACHE STRING "c++ flags" ) diff --git a/osal/CMakeLists.txt b/osal/CMakeLists.txt index caa0084c..2e93ad6e 100644 --- a/osal/CMakeLists.txt +++ b/osal/CMakeLists.txt @@ -34,7 +34,7 @@ add_library(osal STATIC if(ANDROID) add_definitions(-static) # in Android pthread is in libc, also need liblog - target_link_libraries(osal log stdc++ m c ) + target_link_libraries(osal log stdc++ m) else() target_link_libraries(osal pthread) endif()