proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 07:03:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: detect ICC, only try ICC options if ICC

Browse Source 
Some ICC command-line options can cause confusion for other
compilers; test for ICC specifically, and only try to use those
options if ICC is being used.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2021-02-15 13:59:02 -05:00
parent 54c7adbf49
commit 4e90d19ea3
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -191,6 +191,11 @@ CXXFLAGS="$orig_cxxflags"
AC_PROG_CC_C99 AC_PROG_CC_C99
dnl NB: see C11 below dnl NB: see C11 below
dnl Some special handling for ICC later on
if test "$CC" = "icc"; then
cc_is_icc="yes"
fi
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
dnl it's 2019, sed is sed. dnl it's 2019, sed is sed.
@ -252,7 +257,9 @@ AC_DEFUN([AC_LINK_IFELSE_FLAGS], [{
dnl ICC won't bail on unknown options without -diag-error 10006 dnl ICC won't bail on unknown options without -diag-error 10006
dnl need to do this first so we get useful results for the other options dnl need to do this first so we get useful results for the other options
AC_C_FLAG([-diag-error 10006]) if test "$cc_is_icc" = "yes"; then
AC_C_FLAG([-diag-error 10006])
fi
dnl AC_PROG_CC_C99 may change CC to include -std=gnu99 or something dnl AC_PROG_CC_C99 may change CC to include -std=gnu99 or something
ac_cc="$CC" ac_cc="$CC"
@ -335,7 +342,9 @@ AC_SUBST([CXX_COMPAT_CFLAGS])
dnl ICC emits a broken warning for const char *x = a ? "b" : "c"; dnl ICC emits a broken warning for const char *x = a ? "b" : "c";
dnl for some reason the string consts get 'promoted' to char *, dnl for some reason the string consts get 'promoted' to char *,
dnl triggering a const to non-const conversion warning. dnl triggering a const to non-const conversion warning.
AC_C_FLAG([-diag-disable 3179]) if test "$cc_is_icc" = "yes"; then
AC_C_FLAG([-diag-disable 3179])
fi
if test "$enable_werror" = "yes" ; then if test "$enable_werror" = "yes" ; then
WERROR="-Werror" WERROR="-Werror"