From 281b4600611bd7949f69bf56db8c165e74b23ce2 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 28 Feb 2014 13:50:15 +0000 Subject: [PATCH] Now that llvm's build system sets -install_name, we don't need to. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@202500 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/libclang/CMakeLists.txt | 3 --- tools/libclang/Makefile | 7 ------- 2 files changed, 10 deletions(-) diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt index a30e5daef9..d6bbbf8a7a 100644 --- a/tools/libclang/CMakeLists.txt +++ b/tools/libclang/CMakeLists.txt @@ -105,8 +105,5 @@ if(ENABLE_SHARED) set_property(TARGET libclang APPEND_STRING PROPERTY LINK_FLAGS ${LIBCLANG_LINK_FLAGS}) - set_target_properties(libclang - PROPERTIES - INSTALL_NAME_DIR "@rpath") endif() endif() diff --git a/tools/libclang/Makefile b/tools/libclang/Makefile index cbf1cf8e98..41d5166c65 100644 --- a/tools/libclang/Makefile +++ b/tools/libclang/Makefile @@ -50,13 +50,6 @@ ifeq ($(HOST_OS),Darwin) -Wl,$(LLVM_SUBMIT_VERSION).$(LLVM_SUBMIT_SUBVERSION) endif - # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line - DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/') - ifneq ($(DARWIN_VERS),8) - LLVMLibsOptions += -Wl,-install_name \ - -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)" - endif - # If we're doing an Apple-style build, add the LTO object path. ifeq ($(RC_XBS),YES) TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/clang-lto.XXXXXX) -- 2.40.0