commit 7ee7cd543c4aad7f182c1feeab323d3b0c239300
author bjacob <benoitjacob@google.com> Thu Apr 14 11:50:21 2022 -0400
committer GitHub <noreply@github.com> Thu Apr 14 08:50:21 2022 -0700
tree 681fc1929a904682927615b0bc7ad908b3909427
parent 75fa2e7c8be3dfb3c5c1ac08d5ae5c1708a3e42f

Make the dylib CTS support IREE_BYTECODE_MODULE_FORCE_SYSTEM_DYLIB_LINKER (#8890)

This fixes some of the remaining test failures when building with TSan (not TSan errors per se! Just that TSan requires IREE_BYTECODE_MODULE_FORCE_SYSTEM_DYLIB_LINKER).

iree/hal/dylib/cts/CMakeLists.txt

diff --git a/iree/hal/dylib/cts/CMakeLists.txt b/iree/hal/dylib/cts/CMakeLists.txt
index eb7337b..13905b9 100644
--- a/iree/hal/dylib/cts/CMakeLists.txt
+++ b/iree/hal/dylib/cts/CMakeLists.txt
@@ -4,6 +4,14 @@
 # See https://llvm.org/LICENSE.txt for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+if(IREE_BYTECODE_MODULE_FORCE_SYSTEM_DYLIB_LINKER)
+  set(EXECUTABLE_FORMAT_PREFIX "system")
+else()
+  set (EXECUTABLE_FORMAT_PREFIX "embedded")
+endif()
+
+set(EXECUTABLE_FORMAT "\"${EXECUTABLE_FORMAT_PREFIX}-elf-\" IREE_ARCH")
+
 iree_hal_cts_test_suite(
   DRIVER_NAME
     dylib
@@ -14,7 +22,7 @@
   COMPILER_TARGET_BACKEND
     "dylib-llvm-aot"
   EXECUTABLE_FORMAT
-    "\"embedded-elf-\" IREE_ARCH"
+    "${EXECUTABLE_FORMAT}"
   DEPS
     iree::hal::dylib::registration
 )
@@ -29,7 +37,7 @@
   COMPILER_TARGET_BACKEND
     "dylib-llvm-aot"
   EXECUTABLE_FORMAT
-    "\"embedded-elf-\" IREE_ARCH"
+    "${EXECUTABLE_FORMAT}"
   DEPS
     iree::hal::dylib::registration::sync
   EXCLUDED_TESTS