Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "define empty assertion termination function for fixing linking with old android ndk (#5847) #5854

Merged
merged 1 commit into from
Dec 26, 2024
Merged

Revert "define empty assertion termination function for fixing linking with old android ndk (#5847) #5854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,12 +723,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
endif()
endif()

if(ANDROID_NDK_MAJOR AND (ANDROID_NDK_MAJOR GREATER_EQUAL 27))
# llvm 18 in ndk-27 introduce __libcpp_verbose_abort for assertion output
# define empty body for fixing linking issue with old ndk
add_definitions("-D_LIBCPP_VERBOSE_ABORT\\(format,args...\\)=")
endif()

if(NCNN_VULKAN)
if(NCNN_SYSTEM_GLSLANG)
find_package(Threads)
Expand Down Expand Up @@ -772,10 +766,6 @@ if(NCNN_VULKAN)
# glslang requires c++11
set(CMAKE_CXX_STANDARD 11)

# remove ostream usage in glslang for better libcpp abi compatibility
include(cmake/glslang_drop_ostream.cmake)
glslang_drop_ostream(${CMAKE_CURRENT_LIST_DIR}/glslang)

option(BUILD_EXTERNAL "" OFF)
option(ENABLE_SPVREMAPPER "" OFF)
option(ENABLE_GLSLANG_BINARIES "" OFF)
Expand Down
42 changes: 0 additions & 42 deletions cmake/glslang_drop_ostream.cmake
View file
Open in desktop

This file was deleted.

Loading