Path to LLVM dev tools

Author: Meinersbur

flang-rt/CMakeLists.txt

@@ -65,13 +65,16 @@ include(FlangCommon)
 ############################
 
 # Setting these variables from an LLVM build is sufficient that flang-rt can
-# construct the output paths, so it can behave as if it were in-tree here.
+# construct the output paths, so it can behave as if it was in-tree here.
 set(LLVM_TREE_AVAILABLE OFF)
 if (LLVM_LIBRARY_OUTPUT_INTDIR AND LLVM_RUNTIME_OUTPUT_INTDIR AND PACKAGE_VERSION)
   # This is a bootstap build
   set(LLVM_TREE_AVAILABLE ON)
 endif()
 
+# Path to LLVM development tools (FileCheck, llvm-lit, not, ...)
+set(LLVM_TOOLS_DIR "${LLVM_BINARY_DIR}/bin")
+
 if (LLVM_TREE_AVAILABLE)
   # In a bootstrap build emit the libraries into a default search path in the
   # build directory of the just-built compiler. This allows using the

flang-rt/test/CMakeLists.txt

@@ -16,8 +16,6 @@ llvm_canonicalize_cmake_booleans(
   LLVM_ENABLE_PLUGINS
 )
 
-set(FLANG_TOOLS_DIR ${FLANG_BINARY_DIR}/bin)
-
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py

flang-rt/unittests/Runtime/CMakeLists.txt

@@ -37,12 +37,13 @@ add_flangrt_unittest(RuntimeTests
   Time.cpp
   TemporaryStack.cpp
   Transformational.cpp
+
 LINK_LIBS
   flang_rt.unittest
 )
+message("${LLVM_TOOLS_DIR}/not${CMAKE_EXECUTABLE_SUFFIX}")
+target_compile_definitions(RuntimeTests PRIVATE NOT_EXE="${LLVM_TOOLS_DIR}/not${CMAKE_EXECUTABLE_SUFFIX}")
 
 if (FLANG_RT_ENABLE_CUF)
-target_compile_definitions(FlangRuntimeTests PRIVATE NOT_EXE="$<TARGET_FILE:not>")
-
   add_subdirectory(CUDA)
 endif ()