Skip to content

Commit b6dbee3

Browse files
vvereschakatstellar
authored andcommitted
[CMake] Update cache file for Win to ARM cross tooolchain. NFC.
Removed passing CMAKE_AR from the library configurations. (cherry picked from commit 19c1b08)
1 parent 46d19f3 commit b6dbee3

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

clang/cmake/caches/CrossWinToARMLinux.cmake

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ if (NOT DEFINED DEFAULT_SYSROOT)
4242
message(WARNING "DEFAULT_SYSROOT must be specified for the cross toolchain build.")
4343
endif()
4444

45-
if (DEFINED LLVM_AR)
46-
set(CMAKE_AR "${LLVM_AR}" CACHE STRING "")
47-
endif()
4845
if (NOT DEFINED LLVM_TARGETS_TO_BUILD)
4946
set(LLVM_TARGETS_TO_BUILD "ARM" CACHE STRING "")
5047
endif()
@@ -111,7 +108,6 @@ set(LLVM_BUILTIN_TARGETS "${TARGET_TRIPLE}" CACHE STRING "")
111108

112109
set(BUILTINS_${TARGET_TRIPLE}_CMAKE_SYSTEM_NAME "Linux" CACHE STRING "")
113110
set(BUILTINS_${TARGET_TRIPLE}_CMAKE_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING "")
114-
set(BUILTINS_${TARGET_TRIPLE}_CMAKE_AR "${CMAKE_AR}" CACHE STRING "")
115111
set(BUILTINS_${TARGET_TRIPLE}_CMAKE_INSTALL_RPATH "${RUNTIMES_INSTALL_RPATH}" CACHE STRING "")
116112
set(BUILTINS_${TARGET_TRIPLE}_CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE BOOL "")
117113

@@ -122,7 +118,6 @@ set(RUNTIMES_${TARGET_TRIPLE}_LLVM_ENABLE_RUNTIMES "${LLVM_
122118

123119
set(RUNTIMES_${TARGET_TRIPLE}_CMAKE_SYSTEM_NAME "Linux" CACHE STRING "")
124120
set(RUNTIMES_${TARGET_TRIPLE}_CMAKE_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING "")
125-
set(RUNTIMES_${TARGET_TRIPLE}_CMAKE_AR "${CMAKE_AR}" CACHE STRING "")
126121
set(RUNTIMES_${TARGET_TRIPLE}_CMAKE_INSTALL_RPATH "${RUNTIMES_INSTALL_RPATH}" CACHE STRING "")
127122
set(RUNTIMES_${TARGET_TRIPLE}_CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE BOOL "")
128123

0 commit comments

Comments
 (0)