Revert 91528 and use a std::vector instead, fixing an abuse of std::string.

[oota-llvm.git] / lib / System / Makefile

diff --git a/lib/System/Makefile b/lib/System/Makefile
index b4493ecf0a1fa08c53a158ef571f8af158195e72..bb013b9f1f1624762aa590cce6d5985e187d2b50 100644 (file)
--- a/lib/System/Makefile
+++ b/lib/System/Makefile
@@ -1,13 +1,25 @@
-##===- lib/Bytecode/Reader/Makefile ------------------------*- Makefile -*-===##
-# 
+##===- lib/System/Makefile ---------------------------------*- Makefile -*-===##
+#
 #                     The LLVM Compiler Infrastructure
 #
-# This file was developed by the LLVM research group and is distributed under
-# the University of Illinois Open Source License. See LICENSE.TXT for details.
-# 
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
 ##===----------------------------------------------------------------------===##
+
 LEVEL = ../..
-LIBRARYNAME = system
+LIBRARYNAME = LLVMSystem
 BUILD_ARCHIVE = 1
+REQUIRES_RTTI = 1
+include $(LEVEL)/Makefile.config
+
+ifeq ($(HOST_OS),MingW)
+  REQUIRES_EH := 1
+endif
+
+EXTRA_DIST = Unix Win32 README.txt
 
 include $(LEVEL)/Makefile.common
+
+CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
+CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))