[Tarantool-patches] [PATCH luajit 2/3][v4] test: update CMake macro LibRealPath

Sergey Bronnikov estetus at gmail.com
Thu Mar 21 17:02:00 MSK 2024


From: Sergey Bronnikov <sergeyb at tarantool.org>

The patch updates CMake macro LibRealPath:

- Replace CMAKE_CXX_COMPILER with CMAKE_C_COMPILER,
  because LuaJIT doesn't require CXX compiler and thus
  it can be unavailable on a build system.
- Add a check for a code returned by a command with compiler.
- Add a check for a value returned by compiler, the value equal to
  passed one means that library was not found in a system.
---
 test/LuaJIT-tests/CMakeLists.txt | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/test/LuaJIT-tests/CMakeLists.txt b/test/LuaJIT-tests/CMakeLists.txt
index a0fb5440..f744abfe 100644
--- a/test/LuaJIT-tests/CMakeLists.txt
+++ b/test/LuaJIT-tests/CMakeLists.txt
@@ -33,12 +33,27 @@ if(LUAJIT_USE_ASAN)
   # https://github.com/google/sanitizers/issues/934.
   macro(LibRealPath output lib)
     execute_process(
-      COMMAND ${CMAKE_CXX_COMPILER} -print-file-name=${lib}
+      # CMAKE_C_COMPILER is used because it has the same behaviour
+      # as CMAKE_CXX_COMPILER, but CMAKE_CXX_COMPILER is not required
+      # for building LuaJIT and can be missed in GH Actions.
+      COMMAND ${CMAKE_C_COMPILER} -print-file-name=${lib}
       OUTPUT_VARIABLE LIB_LINK
       OUTPUT_STRIP_TRAILING_WHITESPACE
+      RESULT_VARIABLE RES
     )
+    # GCC and Clang returns a passed filename,
+    # when library was not found.
+    if (${LIB_LINK} STREQUAL ${lib})
+      message(FATAL_ERROR "Library '${lib}' is not found")
+    endif()
+    if (NOT RES EQUAL 0)
+      message(FATAL_ERROR "Executing '${CMAKE_C_COMPILER} \
+                           -print-file-name=${lib}' has failed")
+    endif()
+
     # Fortunately, we are not interested in macOS here, so we can
-    # use realpath.
+    # use realpath. Beware, builtin commands always returns
+    # an exit code equal to 0, we cannot check is it failed or not.
     execute_process(
       COMMAND realpath ${LIB_LINK}
       OUTPUT_VARIABLE ${output}
-- 
2.34.1



More information about the Tarantool-patches mailing list