File tree Expand file tree Collapse file tree 2 files changed +8
-7
lines changed
Expand file tree Collapse file tree 2 files changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -991,17 +991,18 @@ build_single_target() {
991991 fi
992992
993993 if [ " ${boringssl} " = ' 1' ]; then
994- if [ " ${_OS} " = ' win' ]; then
995- _LDFLAGS_CXX_GLOBAL+=' -Wl,-Bstatic -lstdc++'
996- else
997- _LDFLAGS_CXX_GLOBAL+=' -lstdc++'
998- fi
999994 if [ " ${_TOOLCHAIN} " = ' llvm-mingw' ]; then
1000995 _LDFLAGS_CXX_GLOBAL+=' -stdlib=libc++'
1001996 # to avoid:
1002997 # ld.lld: error: undefined symbol: _Unwind_Resume
1003998 # >>> referenced by objects.a(args.cc.obj):[...]
1004999 _LDFLAGS_CXX_GLOBAL+=' -lunwind'
1000+ else
1001+ if [ " ${_OS} " = ' win' ]; then
1002+ _LDFLAGS_CXX_GLOBAL+=' -Wl,-Bstatic -lstdc++'
1003+ else
1004+ _LDFLAGS_CXX_GLOBAL+=' -lstdc++'
1005+ fi
10051006 fi
10061007 fi
10071008
Original file line number Diff line number Diff line change 33@@ -404,8 +404,10 @@ if(GCC OR CLANG)
44 endif()
55 set(C_CXX_FLAGS "${C_CXX_FLAGS} -Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings")
6- .
6+
77- if(GCC AND CMAKE_C_COMPILER_VERSION VERSION_GREATER "8")
88+ if((GCC AND CMAKE_C_COMPILER_VERSION VERSION_GREATER "8") OR
99+ (CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS "13"))
1010 # GCC 8.x added a warning called -Wcast-function-type to the -Wextra umbrella.
1111+ # Also suppress for all clang versions supporting this warning.
1212 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-cast-function-type")
1313 endif()
14- .
14+
You can’t perform that action at this time.
0 commit comments