Skip to content

Commit 99437e4

Browse files
dzhidzhoevDanielCChen
authored andcommitted
[lldb][test] Remove objcopy detection from API tests' CMakeLists.txt (llvm#111977)
This commit essentially reverts https://reviews.llvm.org/D30453. In llvm#109961, objcopy util search code was added to dotest.py. dotest.py should use llvm-X by default if no path to a utility X is provided externally. However, it doesn't work out for llvm-objcopy, since objcopy path is always overridden with the lines being removed here. It causes a problem with cross-platform testing when objcopy used by cmake doesn't support targets/executable file formats other than native. I suppose these lines are unnecessary after llvm#109961, so they can be safely removed.
1 parent 30d6246 commit 99437e4

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

lldb/test/API/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
9696
endif()
9797
endif()
9898

99-
if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows|Darwin")
100-
list(APPEND LLDB_TEST_COMMON_ARGS_VAR
101-
--env ARCHIVER=${CMAKE_AR} --env OBJCOPY=${CMAKE_OBJCOPY})
102-
else()
103-
list(APPEND LLDB_TEST_COMMON_ARGS_VAR
104-
--env OBJCOPY=${LLVM_TOOLS_BINARY_DIR}/llvm-objcopy${CMAKE_EXECUTABLE_SUFFIX})
105-
endif()
106-
10799
if (NOT "${LLDB_LIT_TOOLS_DIR}" STREQUAL "")
108100
if (NOT EXISTS "${LLDB_LIT_TOOLS_DIR}")
109101
message(WARNING "LLDB_LIT_TOOLS_DIR ${LLDB_LIT_TOOLS_DIR} does not exist.")

0 commit comments

Comments
 (0)