File tree Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -1127,7 +1127,7 @@ if (CMAKE_OSX_ARCHITECTURES STREQUAL "arm64" OR
1127
1127
endif ()
1128
1128
endif ()
1129
1129
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv8" )
1130
- # Android arm64-v8a
1130
+ # Android arm64-v8a <- NOT REACHED; arm64-v8a and armv8 differ
1131
1131
# Raspberry Pi 3, 4, Zero 2 (32-bit)
1132
1132
list (APPEND ARCH_FLAGS -mno-unaligned-access )
1133
1133
endif ()
@@ -1341,11 +1341,15 @@ list(APPEND GGML_EXTRA_LIBS_PRIVATE Threads::Threads)
1341
1341
1342
1342
find_library (MATH_LIBRARY m )
1343
1343
if (MATH_LIBRARY )
1344
- if (NOT WIN32 OR NOT GGML_SYCL )
1344
+ if (NOT WIN32 OR NOT GGML_SYCL OR NOT CMAKE_SYSTEM_NAME MATCHES "Android" )
1345
1345
list (APPEND GGML_EXTRA_LIBS_PRIVATE m )
1346
1346
endif ()
1347
1347
endif ()
1348
1348
1349
+ if (CMAKE_SYSTEM_NAME MATCHES "Android" )
1350
+ list (APPEND GGML_EXTRA_LIBS_PRIVATE dl ) # Must be linked explicitly
1351
+ endif ()
1352
+
1349
1353
list (REMOVE_DUPLICATES GGML_EXTRA_LIBS_PRIVATE )
1350
1354
list (REMOVE_DUPLICATES GGML_EXTRA_LIBS_PUBLIC )
1351
1355
target_link_libraries (ggml PRIVATE ${GGML_EXTRA_LIBS_PRIVATE} PUBLIC ${GGML_EXTRA_LIBS_PUBLIC} )
You can’t perform that action at this time.
0 commit comments