From fc6cc0edd6589a01f53d497e3c3e4bf8b290f7e2 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 28 Feb 2014 16:16:51 +0000 Subject: With rpaths being set correctly, SHLIBPATH_VAR is not needed anymore. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202510 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Makefile.unittest | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'unittests') diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest index 695bee6d89..a39edc6756 100644 --- a/unittests/Makefile.unittest +++ b/unittests/Makefile.unittest @@ -52,9 +52,6 @@ ifeq ($(ENABLE_SHARED), 1) # we'll never install unittests. LD.Flags += $(RPATH) -Wl,$(SharedLibDir) endif - # Also set {DYLD,LD}_LIBRARY_PATH because OSX ignores the rpath most - # of the time. - Run.Shared := $(SHLIBPATH_VAR)="$(SharedLibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" endif $(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) @@ -67,6 +64,6 @@ $(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) all:: $(LLVMUnitTestExe) unitcheck:: $(LLVMUnitTestExe) - $(Run.Shared) $(LLVMUnitTestExe) + $(LLVMUnitTestExe) endif -- cgit v1.2.3