diff options
| author | Jeffrey Yasskin <jyasskin@google.com> | 2010-02-18 04:43:02 +0000 |
|---|---|---|
| committer | Jeffrey Yasskin <jyasskin@google.com> | 2010-02-18 04:43:02 +0000 |
| commit | 2155d459a7de626bb77849e5956ef2363d7d4a87 (patch) | |
| tree | b0659bdb76efe558b1dbdceaff2d5f3eda2f2ee5 /unittests/Makefile.unittest | |
| parent | adb561d4e0a37c21159405dde90d2ef2d1a5eef9 (diff) | |
Roll back the shared library, r96559. It broke two darwins and arm, mysteriously.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96569 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/Makefile.unittest')
| -rw-r--r-- | unittests/Makefile.unittest | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest index 5094a7e1c3..6fbef54691 100644 --- a/unittests/Makefile.unittest +++ b/unittests/Makefile.unittest @@ -28,10 +28,6 @@ CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/ CPP.Flags += $(NO_VARIADIC_MACROS) TESTLIBS = -lGoogleTest -lUnitTestMain -ifeq ($(ENABLE_SHARED), 1) -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) \ @@ -42,6 +38,6 @@ $(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) all:: $(LLVMUnitTestExe) unitcheck:: $(LLVMUnitTestExe) - $(Run.Shared) $(LLVMUnitTestExe) + $(LLVMUnitTestExe) endif |