Merge pull request #2478 from yingcong-wu/yc/1218-libcxx-mess

[DeviceSanitizer] When link with libc++, link the gcc_s first.
oneapi-src · Jan 6, 2025 · 326d800 · 326d800
1 parent 02582da
commit 326d800
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/source/loader/CMakeLists.txt b/source/loader/CMakeLists.txt
@@ -208,7 +208,8 @@ if(UR_ENABLE_SANITIZER)
             if(NOT EXISTS ${LIBCXX_PATH} OR NOT EXISTS ${LIBCXX_ABI_PATH})
                 message(FATAL_ERROR "libc++ is required but can't find the libraries")
             endif()
-            target_link_libraries(ur_loader PRIVATE ${LIBCXX_PATH} ${LIBCXX_ABI_PATH})
+            # Link with gcc_s fisrt to avoid some symbols resolve to libc++/libc++abi/libunwind's one
+            target_link_libraries(ur_loader PRIVATE gcc_s ${LIBCXX_PATH} ${LIBCXX_ABI_PATH})
         endif()
     endif()