this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Skip mldr32 on Android

Android NDK with x86_64 doesn't support -m32 with -ldl

+15 -8
+15 -8
src/startup/CMakeLists.txt
··· 38 38 add_executable(mldr ${mldr_sources}) 39 39 target_link_libraries(mldr Threads::Threads dl) 40 40 41 - add_executable(mldr32 ${mldr_sources}) 42 - target_link_libraries(mldr32 Threads::Threads dl) 43 - set_target_properties(mldr32 44 - PROPERTIES 45 - COMPILE_FLAGS "-m32" 46 - LINK_FLAGS "-m32" 47 - ) 41 + if(NOT BUILD_ANDROID) 42 + # With Android NDK, -m32 does not work with -ldl as there's 43 + # lib64/libdl.so but no lib/libdl.so 44 + add_executable(mldr32 ${mldr_sources}) 45 + target_link_libraries(mldr32 Threads::Threads dl) 46 + set_target_properties(mldr32 47 + PROPERTIES 48 + COMPILE_FLAGS "-m32" 49 + LINK_FLAGS "-m32" 50 + ) 51 + endif(NOT BUILD_ANDROID) 48 52 49 - install(TARGETS mldr mldr32 DESTINATION libexec/darling/bin) 53 + install(TARGETS mldr DESTINATION libexec/darling/bin) 54 + if(NOT BUILD_ANDROID) 55 + install(TARGETS mldr32 DESTINATION libexec/darling/bin) 56 + endif(NOT BUILD_ANDROID) 50 57 install(TARGETS darling DESTINATION bin 51 58 PERMISSIONS 52 59 OWNER_READ OWNER_WRITE OWNER_EXECUTE