From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 15 Apr 2009 13:56:19 +0000 (+0000)
Subject: Don't use -inline_debug_info for more recent icc versions.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=597fd54b5a1777cf2fe969f80a17d4e6e2f2c7c5;p=dealii-svn.git

Don't use -inline_debug_info for more recent icc versions.

git-svn-id: https://svn.dealii.org/trunk@18614 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index 7b99f54de5..ee17ade4cc 100644
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -738,7 +738,9 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
   
       intel_icc*)
           dnl Earlier icc versions used -Kxxx for flags. Later versions use
-          dnl the gcc convention -fxxx
+          dnl the gcc convention -fxxx. Also, at least since icc11, the
+          dnl flag -inline_debug_info has been deprecated, so don't use
+	  dnl it any more
 	  dnl
 	  dnl Exception handling is also standard in later versions, as is rtti
     	  case "$GXX_VERSION" in
@@ -750,7 +752,7 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
               ;;
 
 	    intel_icc*)
-	      CXXFLAGSG="$CXXFLAGS -DDEBUG -inline_debug_info"
+	      CXXFLAGSG="$CXXFLAGS -DDEBUG"
               CXXFLAGSO="$CXXFLAGS -O2 -unroll"
               CXXFLAGSPIC="-fPIC"
 	      LDFLAGS="$LDFLAGS -lstdc++ -lpthread"
diff --git a/deal.II/configure b/deal.II/configure
index b525461e7b..6ef607dc0c 100755
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -4729,7 +4729,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
           ;;
 
       intel_icc*)
-                    	  	      	  case "$GXX_VERSION" in
+                              	  	  	      	  case "$GXX_VERSION" in
 	    intel_icc5 | intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9)
 	      CXXFLAGSG="$CXXFLAGS -Kc++eh -Krtti -DDEBUG -inline_debug_info"
               CXXFLAGSO="$CXXFLAGS -Kc++eh -Krtti -O2 -unroll"
@@ -4738,7 +4738,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
               ;;
 
 	    intel_icc*)
-	      CXXFLAGSG="$CXXFLAGS -DDEBUG -inline_debug_info"
+	      CXXFLAGSG="$CXXFLAGS -DDEBUG"
               CXXFLAGSO="$CXXFLAGS -O2 -unroll"
               CXXFLAGSPIC="-fPIC"
 	      LDFLAGS="$LDFLAGS -lstdc++ -lpthread"