[llvm] 54db162 - Revert "Define/guard MLIR_STANDALONE_BUILD LLVM_LIBRARY_OUTPUT_INTDIR var."

[Stella Laurenzo via llvm-commits]

Author: Stella Laurenzo
Date: 2023-06-21T10:20:35-07:00
New Revision: 54db162429c69f55ee2a27e852fc02e7c750829a

URL: https://github.com/llvm/llvm-project/commit/54db162429c69f55ee2a27e852fc02e7c750829a
DIFF: https://github.com/llvm/llvm-project/commit/54db162429c69f55ee2a27e852fc02e7c750829a.diff

LOG: Revert "Define/guard MLIR_STANDALONE_BUILD LLVM_LIBRARY_OUTPUT_INTDIR var."

This reverts commit f55fd19b6b565827af5fbf504952dcc35b8b7360.

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.

Added: 
    

Modified: 
    llvm/cmake/modules/AddLLVM.cmake
    mlir/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
index b9635b0346320..926336e4a7aa8 100644
--- a/llvm/cmake/modules/AddLLVM.cmake
+++ b/llvm/cmake/modules/AddLLVM.cmake
@@ -2358,9 +2358,6 @@ function(llvm_setup_rpath name)
     endif()
     if(LLVM_LINKER_IS_GNULD)
       # $ORIGIN is not interpreted at link time by ld.bfd
-      if(NOT LLVM_LIBRARY_OUTPUT_INTDIR)
-        message(SEND_ERROR "Project does not define LLVM_LIBRARY_OUTPUT_INTDIR and it is required")
-      endif()
       set_property(TARGET ${name} APPEND_STRING PROPERTY
                    LINK_FLAGS " -Wl,-rpath-link,${LLVM_LIBRARY_OUTPUT_INTDIR} ")
     endif()

diff  --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt
index 006317507034f..f31403aebb226 100644
--- a/mlir/CMakeLists.txt
+++ b/mlir/CMakeLists.txt
@@ -35,11 +35,6 @@ if(MLIR_STANDALONE_BUILD)
     "${CMAKE_CURRENT_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}")
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
 
-  # Some LLVM CMake utilities use these aliases for the CMake builtin variables.
-  # We set them for compatibility.
-  set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-  set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-
   set(LLVM_LIT_ARGS "-sv" CACHE STRING "Default options for lit")
 endif()