Merging r258729:

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

diff --git a/lib/Support/Makefile b/lib/Support/Makefile
index f39b872be495010b6b54adb55ea24256a97c3797..39426aaaaceef8065f94357bc45f4c2603f18293 100644 (file)
--- a/lib/Support/Makefile
+++ b/lib/Support/Makefile
@@ -1,17 +1,23 @@
 ##===- lib/Support/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 = LLVMSupport
 BUILD_ARCHIVE = 1
 
-## FIXME: This only requires RTTI because tblgen uses it.  Fix that.
-REQUIRES_RTTI = 1
+EXTRA_DIST = Unix Win32 README.txt
 
 include $(LEVEL)/Makefile.common
+
+CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
+CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))
+
+ifdef LLVM_VERSION_INFO
+CompileCommonOpts += -DLLVM_VERSION_INFO='"$(LLVM_VERSION_INFO)"'
+endif