Skip to content

Commit

Permalink
Revert "define empty assertion termination function for fixing linkin…
Browse files Browse the repository at this point in the history
…g with old android ndk (Tencent#5847)"

This reverts commit e431218.
  • Loading branch information
nihui committed Dec 26, 2024
1 parent eb7e92a commit a0c5381
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 52 deletions.
10 changes: 0 additions & 10 deletions CMakeLists.txt
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

This file was deleted.

0 comments on commit a0c5381

Please sign in to comment.