]> granicus.if.org Git - graphviz/commitdiff
drop special build system cases for ICC
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Sun, 20 Nov 2022 19:15:48 +0000 (11:15 -0800)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Tue, 22 Nov 2022 15:46:37 +0000 (07:46 -0800)
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

CHANGELOG.md
configure.ac

index ade52d5366da3892989fe6997131a00775421172..7a63d78e3a3f8120f0ee30a44e48fdc38f051d36 100644 (file)
@@ -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
index 06f56fed73cef692178db50b7ebeb793aa6a2ed0..1f0483994b6830ccb0bd7473ab20207132c00d53 100644 (file)
@@ -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