[llvm-commits] [llvm] r111270 - /llvm/trunk/unittests/Makefile.unittest

Anton Korobeynikov asl at math.spbu.ru
Tue Aug 17 12:34:40 PDT 2010


Author: asl
Date: Tue Aug 17 14:34:40 2010
New Revision: 111270

URL: http://llvm.org/viewvc/llvm-project?rev=111270&view=rev
Log:
This patch enables "make unittests" on enable-shared/mingw.
Patch by Takumi Nakamura!

Modified:
    llvm/trunk/unittests/Makefile.unittest

Modified: llvm/trunk/unittests/Makefile.unittest
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Makefile.unittest?rev=111270&r1=111269&r2=111270&view=diff
==============================================================================
--- llvm/trunk/unittests/Makefile.unittest (original)
+++ llvm/trunk/unittests/Makefile.unittest Tue Aug 17 14:34:40 2010
@@ -37,10 +37,10 @@
 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)





More information about the llvm-commits mailing list