Skip to content

Commit 54db162

Browse files
Revert "Define/guard MLIR_STANDALONE_BUILD LLVM_LIBRARY_OUTPUT_INTDIR var."
This reverts commit f55fd19. As noted on the original thread, other uses of LLVM_LIBRARY_OUTPUT_INTDIR are optional. Will make a separate patch that makes this use optional as well.
1 parent b4827a3 commit 54db162

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

llvm/cmake/modules/AddLLVM.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2358,9 +2358,6 @@ function(llvm_setup_rpath name)
23582358
endif()
23592359
if(LLVM_LINKER_IS_GNULD)
23602360
# $ORIGIN is not interpreted at link time by ld.bfd
2361-
if(NOT LLVM_LIBRARY_OUTPUT_INTDIR)
2362-
message(SEND_ERROR "Project does not define LLVM_LIBRARY_OUTPUT_INTDIR and it is required")
2363-
endif()
23642361
set_property(TARGET ${name} APPEND_STRING PROPERTY
23652362
LINK_FLAGS " -Wl,-rpath-link,${LLVM_LIBRARY_OUTPUT_INTDIR} ")
23662363
endif()

mlir/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ if(MLIR_STANDALONE_BUILD)
3535
"${CMAKE_CURRENT_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}")
3636
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
3737

38-
# Some LLVM CMake utilities use these aliases for the CMake builtin variables.
39-
# We set them for compatibility.
40-
set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
41-
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
42-
4338
set(LLVM_LIT_ARGS "-sv" CACHE STRING "Default options for lit")
4439
endif()
4540

0 commit comments

Comments
 (0)