[LLVMdev] [PATCH] Capability of Win32.DLL with ENABLE_SHARED

NAKAMURA Takumi geek4civic at gmail.com
Sun Aug 15 04:19:23 PDT 2010

This additional patch enables "make unittests" on enable-shared/mingw.
(still unittests would fail in some points. see also my other patches)
It is intended to apply with previous r110016-shlib-dll-2.diff.txt.

Thank you in advance...Takumi
-------------- next part --------------
diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest
index 2a701a0..9a75b2c 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)"
 $(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)

More information about the llvm-dev mailing list