diff options
| -rw-r--r-- | lib/System/Makefile | 6 | ||||
| -rw-r--r-- | unittests/Makefile.unittest | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/System/Makefile b/lib/System/Makefile index 49704c3c62..d4fd60eee5 100644 --- 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 214a1e865e..e09c08f208 100644 --- 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) |