Skip to content

Commit

Permalink
[lldb][test] Remove objcopy detection from API tests' CMakeLists.txt (l…
Browse files Browse the repository at this point in the history
…lvm#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.
  • Loading branch information
dzhidzhoev authored Oct 15, 2024
1 parent 637e81f commit 1cb8314
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions lldb/test/API/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
endif()
endif()

if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows|Darwin")
list(APPEND LLDB_TEST_COMMON_ARGS_VAR
--env ARCHIVER=${CMAKE_AR} --env OBJCOPY=${CMAKE_OBJCOPY})
else()
list(APPEND LLDB_TEST_COMMON_ARGS_VAR
--env OBJCOPY=${LLVM_TOOLS_BINARY_DIR}/llvm-objcopy${CMAKE_EXECUTABLE_SUFFIX})
endif()

if (NOT "${LLDB_LIT_TOOLS_DIR}" STREQUAL "")
if (NOT EXISTS "${LLDB_LIT_TOOLS_DIR}")
message(WARNING "LLDB_LIT_TOOLS_DIR ${LLDB_LIT_TOOLS_DIR} does not exist.")
Expand Down

0 comments on commit 1cb8314

Please sign in to comment.