[clang] c310d0d - [cmake] Invoke ssh.py using Python interpreter, not as executable in CrossWinToARMLinux.cmake
Sergej Jaskiewicz via cfe-commits
cfe-commits at lists.llvm.org
Mon Jun 15 13:59:20 PDT 2020
Author: Sergej Jaskiewicz
Date: 2020-06-15T23:59:06+03:00
New Revision: c310d0de3955b005f652d9cfa798deec8e01a0ba
URL: https://github.com/llvm/llvm-project/commit/c310d0de3955b005f652d9cfa798deec8e01a0ba
DIFF: https://github.com/llvm/llvm-project/commit/c310d0de3955b005f652d9cfa798deec8e01a0ba.diff
LOG: [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.
Added:
Modified:
clang/cmake/caches/CrossWinToARMLinux.cmake
Removed:
################################################################################
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake b/clang/cmake/caches/CrossWinToARMLinux.cmake
index 41ddb836f60e..9aa0efa8049f 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -100,9 +100,11 @@ set(LIBCXX_CXX_ABI_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib/${LIBCXX_TA
set(BUILTINS_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
set(RUNTIMES_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
+find_package(Python3 COMPONENTS Interpreter)
+
# Remote test configuration.
if(DEFINED REMOTE_TEST_HOST)
- set(DEFAULT_TEST_EXECUTOR "${LLVM_PROJECT_DIR}/libcxx/utils/ssh.py --host='${REMOTE_TEST_USER}@${REMOTE_TEST_HOST}'")
+ set(DEFAULT_TEST_EXECUTOR "\\\"${Python3_EXECUTABLE}\\\" \\\"${LLVM_PROJECT_DIR}/libcxx/utils/ssh.py\\\" --host='${REMOTE_TEST_USER}@${REMOTE_TEST_HOST}'")
set(DEFAULT_TEST_TARGET_INFO "libcxx.test.target_info.LinuxRemoteTI")
# Allow override with the custom values.
More information about the cfe-commits
mailing list