Skip to content

Commit 5285895

Browse files
authored
Revert "define empty assertion termination function for fixing linking with old android ndk (#5847)" (#5854)
This reverts commit e431218.
1 parent eb7e92a commit 5285895

File tree

2 files changed

+0
-52
lines changed

2 files changed

+0
-52
lines changed

CMakeLists.txt

-10
Original file line numberDiff line numberDiff line change
@@ -723,12 +723,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
723723
endif()
724724
endif()
725725

726-
if(ANDROID_NDK_MAJOR AND (ANDROID_NDK_MAJOR GREATER_EQUAL 27))
727-
# llvm 18 in ndk-27 introduce __libcpp_verbose_abort for assertion output
728-
# define empty body for fixing linking issue with old ndk
729-
add_definitions("-D_LIBCPP_VERBOSE_ABORT\\(format,args...\\)=")
730-
endif()
731-
732726
if(NCNN_VULKAN)
733727
if(NCNN_SYSTEM_GLSLANG)
734728
find_package(Threads)
@@ -772,10 +766,6 @@ if(NCNN_VULKAN)
772766
# glslang requires c++11
773767
set(CMAKE_CXX_STANDARD 11)
774768

775-
# remove ostream usage in glslang for better libcpp abi compatibility
776-
include(cmake/glslang_drop_ostream.cmake)
777-
glslang_drop_ostream(${CMAKE_CURRENT_LIST_DIR}/glslang)
778-
779769
option(BUILD_EXTERNAL "" OFF)
780770
option(ENABLE_SPVREMAPPER "" OFF)
781771
option(ENABLE_GLSLANG_BINARIES "" OFF)

cmake/glslang_drop_ostream.cmake

-42
This file was deleted.

0 commit comments

Comments
 (0)