Clean up cmake linker flags and introduce support for Sanitizers under linux

Fix test failing on clang-19

Author: Rye

indra/cmake/00-Common.cmake

@@ -15,7 +15,6 @@
 include_guard()
 
 include(Variables)
-include(Linker)
 
 # We go to some trouble to set LL_BUILD to the set of relevant compiler flags.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} $ENV{LL_BUILD}")
@@ -70,9 +69,12 @@ if (WINDOWS)
   # http://www.cmake.org/pipermail/cmake/2009-September/032143.html
   string(REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 
-  add_link_options(/LARGEADDRESSAWARE
-          /NODEFAULTLIB:LIBCMT
-          /IGNORE:4099)
+  add_link_options(
+       /LARGEADDRESSAWARE
+       /NODEFAULTLIB:LIBCMT
+       /IGNORE:4099
+       /MANIFEST:NO
+  )
 
   add_compile_definitions(
       WIN32_LEAN_AND_MEAN
@@ -120,7 +122,6 @@ endif (WINDOWS)
 if (LINUX)
   set( CMAKE_BUILD_WITH_INSTALL_RPATH TRUE )
   set( CMAKE_INSTALL_RPATH $ORIGIN $ORIGIN/../lib )
-  set(CMAKE_EXE_LINKER_FLAGS "-Wl,--exclude-libs,ALL")
 
   find_program(CCACHE_EXE ccache)
   if(CCACHE_EXE AND NOT DISABLE_CCACHE)
@@ -139,76 +140,92 @@ if (LINUX)
           LL_IGNORE_SIGCHLD
   )
 
-  if( ENABLE_ASAN )
-      add_compile_options(-U_FORTIFY_SOURCE
-        -fsanitize=address
-        --param asan-stack=0
-      )
-      add_link_options(-fsanitize=address)
-  else()
-   add_compile_definitions( _FORTIFY_SOURCE=2 )
-  endif()
+  if (USE_ASAN)
+    add_compile_options(-fsanitize=address -fsanitize-recover=address)
+    add_link_options(-fsanitize=address -fsanitize-recover=address)
+  elseif (USE_LEAKSAN)
+    add_compile_options(-fsanitize=leak)
+    add_link_options(-fsanitize=leak)
+  elseif (USE_UBSAN)
+    add_compile_options(-fsanitize=undefined -fno-sanitize=vptr)
+    add_link_options(-fsanitize=undefined -fno-sanitize=vptr)
+  elseif (USE_THREAD_SAN)
+    add_compile_options(-fsanitize=thread)
+    add_link_options(-fsanitize=thread)
+  else ()
+    add_compile_definitions(_FORTIFY_SOURCE=2)
+  endif ()
 
   add_compile_options(
       -fexceptions
       -fno-math-errno
       -fno-strict-aliasing
+      -fno-omit-frame-pointer
       -fsigned-char
       -msse2
       -mfpmath=sse
       -pthread
       -fvisibility=hidden
+      -fstack-protector
   )
 
   add_link_options(
-          -Wl,--no-keep-memory
-          -Wl,--build-id
-          -Wl,--no-undefined
+      "LINKER:--build-id" 
+      "LINKER:--as-needed"
+      "LINKER:-z,relro"
+      "LINKER:-z,now"
   )
 
-  # this stops us requiring a really recent glibc at runtime
-  add_compile_options(-fno-stack-protector)
+  if(LINK_WITH_MOLD)
+    find_program(MOLD_BIN mold)
+    if(MOLD_BIN)
+      message(STATUS "Mold linker found: ${MOLD_BIN}. Enabling mold as active linker.")
+      add_link_options(-fuse-ld=mold)
+    else()
+      set(LINK_WITH_MOLD OFF)
+      message(STATUS "Mold linker not found. Using default linker.")
+    endif()
+  endif()
 
-  if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    # ND: clang is a bit more picky than GCC, the latter seems to auto include -lstdc++ and -lm. The former not so and thus fails to link
-    add_link_options(
-            -lstdc++
-            -lm
-    )
+  if(NOT LINK_WITH_MOLD)
+    # Use LLD for proper clang support under Linux
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+      add_link_options(-fuse-ld=lld) # Use LLD for proper clang support
+    endif()
   endif()
+
 endif (LINUX)
 
 if (DARWIN)
   # Warnings should be fatal -- thanks, Nicky Perian, for spotting reversed default
   set(CLANG_DISABLE_FATAL_WARNINGS OFF)
   set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-  set(DARWIN_extra_cstar_flags "-Wno-deprecated-declarations")
   # Ensure that CMAKE_CXX_FLAGS has the correct -g debug information format --
   # see Variables.cmake.
   string(REPLACE "-gdwarf-2" "-g${CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT}"
     CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DARWIN_extra_cstar_flags}")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  ${DARWIN_extra_cstar_flags}")
   # NOTE: it's critical that the optimization flag is put in front.
   # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
   ## Really?? On developer machines too?
   ##set(ENABLE_SIGNING TRUE)
   ##set(SIGNING_IDENTITY "Developer ID Application: Linden Research, Inc.")
-
-  # required for clang-15/xcode-15 since our boost package still uses deprecated std::unary_function/binary_function
-  # see https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#C++-Standard-Library
-  add_compile_definitions(_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION)
 endif(DARWIN)
 
 if(LINUX OR DARWIN)
-  add_compile_options(-Wall -Wno-sign-compare -Wno-trigraphs -Wno-reorder -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unused-local-typedef)
+  add_compile_options(-Wall -Wno-sign-compare -Wno-trigraphs -Wno-reorder -Wno-unused-but-set-variable -Wno-unused-variable)
+
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    # libstdc++ headers contain deprecated declarations that fail on clang
+    # macOS currently has many deprecated calls
+    add_compile_options(-Wno-unused-local-typedef -Wno-deprecated-declarations)
+  endif()
 
   if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    add_compile_options(-Wno-stringop-truncation -Wno-parentheses -Wno-c++20-compat)
+    add_compile_options(-Wno-stringop-truncation -Wno-parentheses)
   endif()
 
-  if (NOT GCC_DISABLE_FATAL_WARNINGS)
+  if (NOT GCC_DISABLE_FATAL_WARNINGS AND NOT CLANG_DISABLE_FATAL_WARNINGS)
     add_compile_options(-Werror)
   endif ()
 

indra/cmake/CMakeLists.txt

@@ -34,7 +34,6 @@ set(cmake_SOURCE_FILES
         JPEG.cmake
         JPEGEncoderBasic.cmake
         LibVLCPlugin.cmake
-        Linker.cmake
         Linking.cmake
         LLAddBuildTest.cmake
         LLAppearance.cmake

indra/cmake/LLAddBuildTest.cmake

@@ -222,10 +222,7 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
   # The following was copied to llcorehttp/CMakeLists.txt's texture_load target.
   # Any changes made here should be replicated there.
   if (WINDOWS)
-    set_target_properties(INTEGRATION_TEST_${testname}
-            PROPERTIES
-            LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:CONSOLE"
-            )
+    target_link_options(INTEGRATION_TEST_${testname} PRIVATE /debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:CONSOLE)
   endif ()
 
   if (DARWIN)

indra/cmake/Linker.cmake

@@ -49,8 +49,6 @@ list(APPEND linux_crash_logger_SOURCE_FILES
      ${linux_crash_logger_HEADER_FILES}
      )
 
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
-
 add_executable(linux-crash-logger ${linux_crash_logger_SOURCE_FILES})
 
 # llcommon uses `clock_gettime' which is provided by librt on linux.

indra/linux_crash_logger/CMakeLists.txt

@@ -349,9 +349,9 @@ namespace tut
         ensure(
             "2. LLVector4 operator*(const LLVector4 &a, const LLQuaternion &rot) failed",
             is_approx_equal(-58153.5390f, result.mV[0]) &&
-            (183787.8125f == result.mV[1]) &&
-            (116864.164063f == result.mV[2]) &&
-            (78.099998f == result.mV[3]));
+            is_approx_equal(183787.8125f, result.mV[1]) &&
+            is_approx_equal(116864.164063f, result.mV[2]) &&
+            is_approx_equal(78.099998f, result.mV[3]));
     }
 
     //test case for LLVector3 operator*(const LLVector3 &a, const LLQuaternion &rot) fn.

indra/llmath/tests/llquaternion_test.cpp

@@ -81,6 +81,6 @@ if (LL_TESTS)
       llgltfmaterial.cpp
       )
 
-    set_property(SOURCE llprimitive.cpp PROPERTY LL_TEST_ADDITIONAL_LIBRARIES llmessage)
+    set_property(SOURCE llprimitive.cpp PROPERTY LL_TEST_ADDITIONAL_LIBRARIES llmessage llfilesystem)
     LL_ADD_PROJECT_UNIT_TESTS(llprimitive "${llprimitive_TEST_SOURCE_FILES}")
 endif (LL_TESTS)

indra/llprimitive/CMakeLists.txt

@@ -50,16 +50,8 @@ if (LINUX)
   )
 
   list(APPEND media_plugin_cef_SOURCE_FILES ${LINUX_VOLUME_CATCHER})
-  set(CMAKE_SHARED_LINKER_FLAGS  "-Wl,--build-id -Wl,-rpath,'$ORIGIN:$ORIGIN/../../lib'")
-  list(APPEND media_plugin_cef_LINK_LIBRARIES llwindow )
 elseif (DARWIN)
   list(APPEND media_plugin_cef_SOURCE_FILES volume_catcher_null.cpp)
-  find_library(CORESERVICES_LIBRARY CoreServices)
-  find_library(AUDIOUNIT_LIBRARY AudioUnit)
-  set( media_plugin_cef_LINK_LIBRARIES
-       ${CORESERVICES_LIBRARY}     # for Component Manager calls
-       ${AUDIOUNIT_LIBRARY}        # for AudioUnit calls
-       )
 elseif (WINDOWS)
   list(APPEND media_plugin_cef_SOURCE_FILES windows_volume_catcher.cpp)
 endif (LINUX)
@@ -81,15 +73,15 @@ target_link_libraries(media_plugin_cef
         ll::glib_headers
 )
 
-if (WINDOWS)
-  set_target_properties(
-    media_plugin_cef
-    PROPERTIES
-    LINK_FLAGS "/MANIFEST:NO /NODEFAULTLIB:LIBCMT /IGNORE:4099"
+if (DARWIN)
+    find_library(CORESERVICES_LIBRARY CoreServices)
+    find_library(AUDIOUNIT_LIBRARY AudioUnit)
+  
+    target_link_libraries(media_plugin_cef
+    ${CORESERVICES_LIBRARY}     # for Component Manager calls
+    ${AUDIOUNIT_LIBRARY}        # for AudioUnit calls
     )
-endif (WINDOWS)
 
-if (DARWIN)
   # Don't prepend 'lib' to the executable name, and don't embed a full path in the library's install name
   set_target_properties(
     media_plugin_cef
@@ -107,5 +99,6 @@ if (DARWIN)
     VERBATIM
     COMMENT "Fixing path to CEF Framework"
   )
-
-endif (DARWIN)
+elseif (LINUX)
+  target_link_options(media_plugin_cef PRIVATE  "LINKER:--build-id" "LINKER:-rpath,'$ORIGIN:$ORIGIN/../../lib'")
+endif ()

indra/media_plugins/cef/CMakeLists.txt

@@ -24,14 +24,6 @@ add_library(media_plugin_example
 
 target_link_libraries(media_plugin_example media_plugin_base )
 
-if (WINDOWS)
-  set_target_properties(
-    media_plugin_example
-    PROPERTIES
-    LINK_FLAGS "/MANIFEST:NO /NODEFAULTLIB:LIBCMT"
-    )
-endif (WINDOWS)
-
 if (DARWIN)
   # Don't prepend 'lib' to the executable name, and don't embed a full path in the library's install name
   set_target_properties(

indra/media_plugins/example/CMakeLists.txt

@@ -28,14 +28,6 @@ target_link_libraries(media_plugin_libvlc
         ll::libvlc
 )
 
-if (WINDOWS)
-  set_target_properties(
-    media_plugin_libvlc
-    PROPERTIES
-    LINK_FLAGS "/MANIFEST:NO /NODEFAULTLIB:LIBCMT"
-    )
-endif (WINDOWS)
-
 if (DARWIN)
   # Don't prepend 'lib' to the executable name, and don't embed a full path in the library's install name
   set_target_properties(