diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2009-10-02 19:36:31 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2009-10-02 19:36:31 +0000 |
| commit | f01ee30328fa28a97ed333c4a9f91d79d1f34220 (patch) | |
| tree | 88d51863abf6c9fe4e22774ee220121f974e2ee6 | |
| parent | 3b008a3a65d2e66362e2391d29290a8f4707d32a (diff) | |
| download | bcm5719-llvm-f01ee30328fa28a97ed333c4a9f91d79d1f34220.tar.gz bcm5719-llvm-f01ee30328fa28a97ed333c4a9f91d79d1f34220.zip | |
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!
llvm-svn: 83251
| -rw-r--r-- | llvm/lib/System/Makefile | 6 | ||||
| -rw-r--r-- | llvm/unittests/Makefile.unittest | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/llvm/lib/System/Makefile b/llvm/lib/System/Makefile index 49704c3c625..d4fd60eee5f 100644 --- a/llvm/lib/System/Makefile +++ b/llvm/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/llvm/unittests/Makefile.unittest b/llvm/unittests/Makefile.unittest index 214a1e865ea..e09c08f208e 100644 --- a/llvm/unittests/Makefile.unittest +++ b/llvm/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) |
