summaryrefslogtreecommitdiff
path: root/unittests/Makefile.unittest
diff options
context:
space:
mode:
authorJeffrey Yasskin <jyasskin@google.com>2010-02-23 20:53:37 +0000
committerJeffrey Yasskin <jyasskin@google.com>2010-02-23 20:53:37 +0000
commit407fbdd161d4134901fefe267779a4aaaeab2f0d (patch)
tree10889569ea16b2dd7523646ad44c85166abc5687 /unittests/Makefile.unittest
parentd7283d9c54dbc45d47ee0fbed0fbdcbf0ae74f23 (diff)
Roll back r96959 again.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96981 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/Makefile.unittest')
-rw-r--r--unittests/Makefile.unittest13
1 files changed, 1 insertions, 12 deletions
diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest
index 9dfb965d38f..6fbef54691d 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