X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=dd09f8fa3c776e0ca0051bd2af4359e86da78d31;hb=b45701b7997f72dd72d0acd3f3ecf535f1022152;hp=db7bebfe2ad975d18feca064b70701a8c55538eb;hpb=0b197c823449fb5696d29f0c67d7959a14bcdbed;p=mono.git

diff --git a/configure.in b/configure.in
index db7bebfe2ad..dd09f8fa3c7 100644
--- a/configure.in
+++ b/configure.in
@@ -548,7 +548,7 @@ if test x"$GCC" = xyes; then
 		if test "x$mono_cv_clang" = "xyes"; then
 	   	   # https://bugzilla.samba.org/show_bug.cgi?id=8118
 	   	   WARN="$WARN -Qunused-arguments"
-		   WARN="$WARN -Wno-unused-function -Wno-tautological-compare -Wno-parentheses-equality"
+		   WARN="$WARN -Wno-unused-function -Wno-tautological-compare -Wno-parentheses-equality -Wno-self-assign"
 		fi
 else
 	# The Sun Forte compiler complains about inline functions that access static variables
@@ -2452,12 +2452,10 @@ if test "x$enable_llvm" = "xyes"; then
    llvm_version=`$LLVM_CONFIG --version`
    major_version=`echo $llvm_version | cut -c 1`
    minor_version=`echo $llvm_version | cut -c 3`
-   llvm_api_version=`$LLVM_CONFIG --mono-api-version 2>&1`
+   llvm_api_version=`$LLVM_CONFIG --mono-api-version 2>/dev/null`
    AC_MSG_CHECKING(LLVM version)
    AC_MSG_RESULT($llvm_version)
    if echo $llvm_version | grep -q 'mono'; then
-   	  AC_DEFINE(LLVM_MONO_BRANCH, 1, [Whenever we are using the mono branch of LLVM])
-	  LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_MONO_BRANCH"	  
 	  if test "x$enable_llvm_version_check" == "xyes"; then
 	  	 if test "$llvm_version" != "$expected_llvm_version"; then
 	  	 	AC_MSG_ERROR([Expected llvm version $expected_llvm_version, but llvm-config --version returned $llvm_version"])