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
This commit is contained in:
Benjamin Kramer 2009-10-02 19:36:31 +00:00
parent 8bff4af612
commit 7d26948662
2 changed files with 7 additions and 1 deletions

View File

@ -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

View File

@ -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)