Skip to content

Commit c310d0d

Browse files
committed
[cmake] Invoke ssh.py using Python interpreter, not as executable in CrossWinToARMLinux.cmake
The issue is that Windows doesn't support shebangs. This caused issues with libc++ tests.
1 parent a7eb369 commit c310d0d

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

clang/cmake/caches/CrossWinToARMLinux.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,11 @@ set(LIBCXX_CXX_ABI_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib/${LIBCXX_TA
100100
set(BUILTINS_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
101101
set(RUNTIMES_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
102102

103+
find_package(Python3 COMPONENTS Interpreter)
104+
103105
# Remote test configuration.
104106
if(DEFINED REMOTE_TEST_HOST)
105-
set(DEFAULT_TEST_EXECUTOR "${LLVM_PROJECT_DIR}/libcxx/utils/ssh.py --host='${REMOTE_TEST_USER}@${REMOTE_TEST_HOST}'")
107+
set(DEFAULT_TEST_EXECUTOR "\\\"${Python3_EXECUTABLE}\\\" \\\"${LLVM_PROJECT_DIR}/libcxx/utils/ssh.py\\\" --host='${REMOTE_TEST_USER}@${REMOTE_TEST_HOST}'")
106108
set(DEFAULT_TEST_TARGET_INFO "libcxx.test.target_info.LinuxRemoteTI")
107109

108110
# Allow override with the custom values.

0 commit comments

Comments
 (0)