[llvm-commits] [llvm] r83251 - in /llvm/trunk: lib/System/Makefile unittests/Makefile.unittest

[Benjamin Kramer]

Author: d0k
Date: Fri Oct  2 14:36:31 2009
New Revision: 83251

URL: http://llvm.org/viewvc/llvm-project?rev=83251&view=rev
Log:
MingW build fixes

- MingW needs -lpsapi (in ${LIBS}) linked after -lLLVMSystem.
  Noticed by Ronald Pijnacker!

- Some parts of the System library must be build with exceptions on windows.
  Based on a patch by Jay Foad!

Modified:
    llvm/trunk/lib/System/Makefile
    llvm/trunk/unittests/Makefile.unittest

Modified: llvm/trunk/lib/System/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/System/Makefile?rev=83251&r1=83250&r2=83251&view=diff

==============================================================================
--- llvm/trunk/lib/System/Makefile (original)
+++ llvm/trunk/lib/System/Makefile Fri Oct  2 14:36:31 2009
@@ -11,6 +11,12 @@
 LIBRARYNAME = LLVMSystem
 BUILD_ARCHIVE = 1
 
+include $(LEVEL)/Makefile.config
+
+ifeq ($(HOST_OS),MingW)
+  REQUIRES_EH := 1
+endif
+
 EXTRA_DIST = Unix Win32 README.txt
 
 include $(LEVEL)/Makefile.common

Modified: llvm/trunk/unittests/Makefile.unittest
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Makefile.unittest?rev=83251&r1=83250&r2=83251&view=diff

==============================================================================
--- llvm/trunk/unittests/Makefile.unittest (original)
+++ llvm/trunk/unittests/Makefile.unittest Fri Oct  2 14:36:31 2009
@@ -25,7 +25,7 @@
 $(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
 	$(Echo) Linking $(BuildMode) unit test $(TESTNAME) $(StripWarnMsg)
 	$(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \
-	$(LIBS) $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB)
+	$(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS) 
 	$(Echo) ======= Finished Linking $(BuildMode) Unit test $(TESTNAME) \
           $(StripWarnMsg)