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!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@83251 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/System/Makefile b/lib/System/Makefile
index 49704c3c625a6a03fd35169f2ae5866b66278008..d4fd60eee5f62d9acea676f8352059dcba29d340 100644 (file)
--- a/lib/System/Makefile
+++ b/lib/System/Makefile
@@ -11,6 +11,12 @@ LEVEL = ../..
 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

diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest
index 214a1e865eae27c05e7db2eb362bac83796553da..e09c08f208e76776912e970fc45e091484a0c60b 100644 (file)
--- a/unittests/Makefile.unittest
+++ b/unittests/Makefile.unittest
@@ -25,7 +25,7 @@ LIBS += -lGoogleTest -lUnitTestMain
 $(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)