[libcxx-commits] [libcxx] 6e43f3f - [libc++] Do not set CMAKE_BUILD_WITH_INSTALL_NAME_DIR

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2021-07-06T14:46:47-04:00
New Revision: 6e43f3fc141f73a50638aab159de92c1c6d257da

URL: https://github.com/llvm/llvm-project/commit/6e43f3fc141f73a50638aab159de92c1c6d257da
DIFF: https://github.com/llvm/llvm-project/commit/6e43f3fc141f73a50638aab159de92c1c6d257da.diff

LOG: [libc++] Do not set CMAKE_BUILD_WITH_INSTALL_NAME_DIR

I'm not sure what that gains us, and it creates a problem when
trying to run the tests against libc++ with a custom install name
dir (e.g. /usr/lib), since the library that we link against (in
the build tree) will advertise itself as /usr/lib/libc++.dylib,
so we end up linking against the system dylib at runtime.

Differential Revision: https://reviews.llvm.org/D105499

Added: 
    

Modified: 
    libcxx/CMakeLists.txt
    libcxx/utils/ci/runtimes/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index 06ee1d74a03e6..ab1a5b5361a7c 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -10,8 +10,6 @@ endif()
 #===============================================================================
 cmake_minimum_required(VERSION 3.13.4)
 
-set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
-
 # Add path for custom modules
 set(CMAKE_MODULE_PATH
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake"

diff  --git a/libcxx/utils/ci/runtimes/CMakeLists.txt b/libcxx/utils/ci/runtimes/CMakeLists.txt
index 8a7e2a9a41a9f..9771172b6e0af 100644
--- a/libcxx/utils/ci/runtimes/CMakeLists.txt
+++ b/libcxx/utils/ci/runtimes/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.13.4)
 project(LLVM_RUNTIMES C CXX ASM)
 
-set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
-
 find_package(Python3 COMPONENTS Interpreter)
 if(NOT Python3_Interpreter_FOUND)
   message(WARNING "Python3 not found, using python2 as a fallback")