From 407fbdd161d4134901fefe267779a4aaaeab2f0d Mon Sep 17 00:00:00 2001 From: Jeffrey Yasskin Date: Tue, 23 Feb 2010 20:53:37 +0000 Subject: Roll back r96959 again. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96981 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Makefile.unittest | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'unittests/Makefile.unittest') diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest index 9dfb965d38..6fbef54691 100644 --- a/unittests/Makefile.unittest +++ b/unittests/Makefile.unittest @@ -28,17 +28,6 @@ CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/ CPP.Flags += $(NO_VARIADIC_MACROS) TESTLIBS = -lGoogleTest -lUnitTestMain -ifeq ($(ENABLE_SHARED), 1) - # Add the absolute path to the dynamic library. This is ok because - # we'll never install unittests. - LD.Flags += $(RPATH) -Wl,$(LibDir) -endif -ifeq ($(ENABLE_SHARED), 1) - # Also set {DYLD,LD}_LIBRARY_PATH because OSX ignores the rpath most - # of the time. - Run.Shared := $(SHLIBPATH_VAR)="$(LibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" -endif - $(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(Echo) Linking $(BuildMode) unit test $(TESTNAME) $(StripWarnMsg) $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ @@ -49,6 +38,6 @@ $(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) all:: $(LLVMUnitTestExe) unitcheck:: $(LLVMUnitTestExe) - $(Run.Shared) $(LLVMUnitTestExe) + $(LLVMUnitTestExe) endif -- cgit v1.2.3