[Mlir-commits] [mlir] 7402521 - [mlir-cpu-runner] Pass --exclude-libs to linker when building runner (#122920)

[llvmlistbot at llvm.org]

Author: Andrea Faulds
Date: 2025-01-15T17:05:11+01:00
New Revision: 740252164ed830502ff966628bc07be07e10159b

URL: https://github.com/llvm/llvm-project/commit/740252164ed830502ff966628bc07be07e10159b
DIFF: https://github.com/llvm/llvm-project/commit/740252164ed830502ff966628bc07be07e10159b.diff

LOG: [mlir-cpu-runner] Pass --exclude-libs to linker when building runner (#122920)

This fixes a conflict between the version of LLVM linked against by the
runner and the unrelated version of LLVM that may be dynamically loaded
by a graphics driver. (Relevant to #73457: fixes loading certain Vulkan
drivers.)

Recommit of f879da799b4e112d79243dde6d299259d8359eeb, which had been
reverted by d8d30a96031bfdad3e2c424e14a4247c14980cb5 due to it causing
UBSan/ASan/HWASan/MSan build failures.

Added: 
    

Modified: 
    mlir/tools/mlir-cpu-runner/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/mlir/tools/mlir-cpu-runner/CMakeLists.txt b/mlir/tools/mlir-cpu-runner/CMakeLists.txt
index 811583b97bc71d..cb937ace1de317 100644
--- a/mlir/tools/mlir-cpu-runner/CMakeLists.txt
+++ b/mlir/tools/mlir-cpu-runner/CMakeLists.txt
@@ -26,3 +26,14 @@ target_link_libraries(mlir-cpu-runner PRIVATE
   MLIRExecutionEngine
   MLIRJitRunner
   )
+
+# Preventing re-export of symbols causes link errors with ASan and UBSan libs.
+if (NOT LLVM_USE_SANITIZER)
+  target_link_options(mlir-cpu-runner
+    PRIVATE
+      # On Linux, disable re-export of any static linked libraries that came
+      # through. This prevents our LLVM build from interfering with the version
+      # of LLVM included in certain graphics drivers.
+      $<$<PLATFORM_ID:Linux>:LINKER:--exclude-libs,ALL>
+  )
+endif()