F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Use stacktrace flags by default only in module libraries

Browse Source 
Previously it was being linked to executables and libraries, which caused symbol redefinitions when building statically.
This commit is contained in:
Gabriel Ferreira
2025-07-26 18:28:37 +02:00
parent 046bbaa3cc
commit 537bd14cff
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build-support/custom-modules/ns3-compiler-workarounds.cmake
View File

@@ -63,18 +63,19 @@ check_cxx_source_compiles(
"
STACKTRACE_LIBRARY_ENABLED
)
mark_as_advanced(stacktrace_flags)
set(stacktrace_flags "" CACHE INTERNAL "")
if(STACKTRACE_LIBRARY_ENABLED)
set(stacktrace_flags)
if(GCC)
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "12.0.0")
# GCC does not support stacktracing
elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "14.0.0")
set(stacktrace_flags -lstdc++_libbacktrace)
set(stacktrace_flags -lstdc++_libbacktrace CACHE INTERNAL "")
else()
set(stacktrace_flags -lstdc++exp)
set(stacktrace_flags -lstdc++exp CACHE INTERNAL "")
endif()
elseif(CLANG)
set(stacktrace_flags -lstdc++_libbacktrace)
set(stacktrace_flags -lstdc++_libbacktrace CACHE INTERNAL "")
else()
# Most likely MSVC, which does not need custom flags for this
endif()
@@ -96,6 +97,7 @@ if(STACKTRACE_LIBRARY_ENABLED)
if(STACKTRACE_LIBRARY_IS_LINKED)
add_definitions(-DSTACKTRACE_LIBRARY_IS_LINKED=1)
link_libraries(${stacktrace_flags})
else()
set(stacktrace_flags "" CACHE INTERNAL "")
endif()
endif()

4
build-support/custom-modules/ns3-module-macros.cmake
View File

@@ -288,8 +288,8 @@ endfunction()
function(build_lib_reexport_third_party_libraries libname libraries_to_link)
# Separate ns-3 and non-ns-3 libraries to manage their propagation properly
separate_ns3_from_non_ns3_libs(
"${libname}" "${libraries_to_link}" ns_libraries_to_link
non_ns_libraries_to_link
"${libname}" "${libraries_to_link};${stacktrace_flags}"
ns_libraries_to_link non_ns_libraries_to_link
)
set(ns3-external-libs "${non_ns_libraries_to_link};${ns3-external-libs}"