From: Anton Korobeynikov Date: Tue, 17 Aug 2010 19:34:40 +0000 (+0000) Subject: This patch enables "make unittests" on enable-shared/mingw. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=462aaeb17857ac5bd3bba086a6d1c08f23b5a797;p=oota-llvm.git This patch enables "make unittests" on enable-shared/mingw. Patch by Takumi Nakamura! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@111270 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest index 2a701a019d8..9a75b2c2eb8 100644 --- a/unittests/Makefile.unittest +++ b/unittests/Makefile.unittest @@ -37,10 +37,10 @@ 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) + LD.Flags += $(RPATH) -Wl,$(SharedLibDir) # Also set {DYLD,LD}_LIBRARY_PATH because OSX ignores the rpath most # of the time. - Run.Shared := $(SHLIBPATH_VAR)="$(LibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" + Run.Shared := $(SHLIBPATH_VAR)="$(SharedLibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" endif $(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)