From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 20 Nov 2022 19:15:48 +0000 (-0800)
Subject: drop special build system cases for ICC
X-Git-Tag: 7.0.3~8^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e1d79771f3dfc892446e9d820d1200097cc35bb;p=graphviz

drop special build system cases for ICC

The Intel C Compiler is now based on LLVM. We think this means it has a Clang
compatible front end, though we do not have access to it to check. If this is
accurate, it means the build system no longer needs any specialized ICC support.

Gitlab: closes #2298
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ade52d536..7a63d78e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased (7.0.3)]
 
+### Changed
+
+* Support for the Intel C Compiler in the Autotools build system has been
+  removed. #2298
+
 ### Fixed
 
 - The CMake build system no longer builds auxiliary tools beyond `gvpack` with
diff --git a/configure.ac b/configure.ac
index 06f56fed7..1f0483994 100644
--- a/configure.ac
+++ b/configure.ac
@@ -373,33 +373,23 @@ if test "${GCC}" != "yes" ; then
     esac
 else
     AC_CHECK_PROGS(RC,[windres ${host}-windres],false)
-    case "${CC}" in
-	*icc* )
-	    # -Wall causes relocation errors with icc
-	    CFLAGS="${CFLAGS} -wd269"
-	    # icc doesn't like -pipe
-	    CFLAGS=`echo ${CFLAGS} | sed 's/ -pipe//'`
-	    ;;
-	* )
-	    case "${build}" in
-	    *-dec-osf* )
-			CFLAGS="${CFLAGS} -mieee -Wall"
-	        ;;
-	    *alpha*-*-linux* )
-            CFLAGS="${CFLAGS} -mieee -Wall"
-            ;;
-	    *-apple-darwin* )
-	        CFLAGS="${CFLAGS} -fno-common -Wall"
-	        LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
-	        ;;
-	    *-freebsd* )
-	        CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall"
-		    ;;
-	    * )
-	        CFLAGS="${CFLAGS} -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith -Wall"
-	        ;;
-	    esac
-	    ;;
+    case "${build}" in
+    *-dec-osf* )
+      CFLAGS="${CFLAGS} -mieee -Wall"
+      ;;
+    *alpha*-*-linux* )
+      CFLAGS="${CFLAGS} -mieee -Wall"
+      ;;
+    *-apple-darwin* )
+      CFLAGS="${CFLAGS} -fno-common -Wall"
+      LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
+      ;;
+    *-freebsd* )
+      CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall"
+      ;;
+    * )
+      CFLAGS="${CFLAGS} -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith -Wall"
+      ;;
     esac
 fi
 
@@ -413,8 +403,8 @@ AC_ARG_ENABLE([debug],
 	[enable_debug=no])
 AM_CONDITIONAL([DEBUG], [test $enable_debug = "yes"])
 if test "x$enable_debug" = "xyes"; then
-  dnl add -O0 only if GCC or ICC is used
-  if test "$GCC" = "yes" || test "$ICC" = "yes"; then
+  dnl add -O0 only if GCC is used
+  if test "$GCC" = "yes"; then
     CFLAGS="$CFLAGS -g -O0"
     CXXFLAGS="$CXXFLAGS -g -O0"
   fi