Skip to content

Commit

Permalink
rerun autotools
Browse files Browse the repository at this point in the history
  • Loading branch information
svigerske committed Dec 7, 2024
1 parent 5bb5948 commit d63fe2c
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 27 deletions.
2 changes: 1 addition & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ More detailed information about incremental changes can be found in the
(POSIX systems) or SIGINT/SIGTERM/SIGABRT (Windows systems).
- New option `mumps_mpi_communicator` to specify the MPI communicator when using
an MPI-enabled build of MUMPS [#790, by Alex Tyler Chapman].
- Updated build system to current autotools versions.
- Updated build system to current autotools versions; initial support for icx/ifx and flang

### 3.14.16 (2024-04-22)

Expand Down
2 changes: 2 additions & 0 deletions compile
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,8 @@ EOF
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe | \
icx | *[/\\]icx | icx.exe | *[/\\]icx.exe | \
ifx | *[/\\]ifx | ifx.exe | *[/\\]ifx.exe | \
ifort | *[/\\]ifort | ifort.exe | *[/\\]ifort.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
Expand Down
52 changes: 26 additions & 26 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -3730,7 +3730,7 @@ else case e in #(
e) enable_msvc=no
case $build in
*-mingw* | *-cygwin* | *-msys* )
for ac_prog in gcc clang icl cl
for ac_prog in gcc clang icx icl cl
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
Expand Down Expand Up @@ -3778,7 +3778,7 @@ fi
test -n "$CC" && break
done

case "$CC" in *cl ) enable_msvc=yes ;; esac
case "$CC" in *cl | *icx ) enable_msvc=yes ;; esac
;;
esac ;;
esac
Expand Down Expand Up @@ -4817,7 +4817,7 @@ fi


if test $enable_msvc = yes ; then
for ac_prog in icl cl
for ac_prog in icx icl cl
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
Expand Down Expand Up @@ -4881,7 +4881,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
for ac_prog in gcc clang cc icc icl cl cc xlc xlc_r pgcc
for ac_prog in gcc clang cc icx icc icl cl cc xlc xlc_r pgcc
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
Expand Down Expand Up @@ -4931,7 +4931,7 @@ fi
fi
if test -z "$CC"; then
ac_ct_CC=$CC
for ac_prog in gcc clang cc icc icl cl cc xlc xlc_r pgcc
for ac_prog in gcc clang cc icx icc icl cl cc xlc xlc_r pgcc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
Expand Down Expand Up @@ -5775,7 +5775,7 @@ fi


if test $enable_msvc = yes ; then
for ac_prog in icl cl
for ac_prog in icx icl cl
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
Expand Down Expand Up @@ -5843,7 +5843,7 @@ if test -z "$CXX"; then
CXX=$CCC
else
if test -n "$ac_tool_prefix"; then
for ac_prog in g++ clang++ c++ pgCC icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
for ac_prog in g++ clang++ c++ pgCC icx icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
Expand Down Expand Up @@ -5893,7 +5893,7 @@ fi
fi
if test -z "$CXX"; then
ac_ct_CXX=$CXX
for ac_prog in g++ clang++ c++ pgCC icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
for ac_prog in g++ clang++ c++ pgCC icx icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
Expand Down Expand Up @@ -6442,7 +6442,7 @@ fi
# first in PATH, which causes compile and link checks to fail.)
# For the same reason, set LD to use the compile wrapper.
if test $enable_msvc = yes ; then
for ac_prog in ifort
for ac_prog in ifx ifort
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
Expand Down Expand Up @@ -6506,7 +6506,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
for ac_prog in gfortran ifort g95 fort77 f77 f95 f90 g77 pgf90 pgf77 ifc frt af77 xlf_r fl32
for ac_prog in gfortran ifx ifort flang g95 fort77 f77 f95 f90 g77 pgf90 pgf77 ifc frt af77 xlf_r fl32
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
Expand Down Expand Up @@ -6556,7 +6556,7 @@ fi
fi
if test -z "$F77"; then
ac_ct_F77=$F77
for ac_prog in gfortran ifort g95 fort77 f77 f95 f90 g77 pgf90 pgf77 ifc frt af77 xlf_r fl32
for ac_prog in gfortran ifx ifort flang g95 fort77 f77 f95 f90 g77 pgf90 pgf77 ifc frt af77 xlf_r fl32
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
Expand Down Expand Up @@ -13911,8 +13911,8 @@ fi
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
case $cc_basename in
cl* | icl* | ifort*)
# Native MSVC or ICC or IFORT
cl* | icl* | ifort* | icx* | ifx*)
# Native MSVC or classic or new Intel Compilers
hardcode_libdir_flag_spec=' '
allow_undefined_flag=unsupported
always_export_symbols=yes
Expand Down Expand Up @@ -13953,7 +13953,7 @@ fi
fi'
;;
*)
# Assume MSVC and ICC and IFORT wrapper
# Assume MSVC and Intel compilers wrapper
hardcode_libdir_flag_spec=' '
allow_undefined_flag=unsupported
# Tell ltmain to make .lib files, not .a files.
Expand Down Expand Up @@ -15014,8 +15014,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
dynamic_linker='Win32 ld.exe'
;;

*,cl* | *,icl* | *,ifort*)
# Native MSVC or ICC or IFORT
*,cl* | *,icl* | *,ifort* | *,icx* | *,ifx*)
# Native MSVC or classic or new Intel Compilers
libname_spec='$name'
soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
library_names_spec='$libname.dll.lib'
Expand Down Expand Up @@ -17732,8 +17732,8 @@ fi

cygwin* | mingw* | windows* | pw32* | cegcc*)
case $GXX,$cc_basename in
,cl* | no,cl* | ,icl* | no,icl* | ,ifort* | no,ifort* )
# Native MSVC or ICC or IFORT
,cl* | no,cl* | ,icl* | no,icl* | ,ifort* | no,ifort* | ,icx* | no,icx* | ,ifx* | no,ifx*)
# Native MSVC or classic or new Intel compilers
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_CXX=' '
Expand Down Expand Up @@ -19330,7 +19330,7 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries
;;
cygwin* | mingw* | windows* | cegcc*)
case $cc_basename in
cl* | icl* | ifort*)
cl* | icl* | ifort* | icx* | ifx*)
exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
;;
*)
Expand Down Expand Up @@ -19708,8 +19708,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
dynamic_linker='Win32 ld.exe'
;;

*,cl* | *,icl* | *,ifort*)
# Native MSVC or ICC or IFORT
*,cl* | *,icl* | *,ifort* | *,icx* | *,ifx*)
# Native MSVC or classic or new Intel Compilers
libname_spec='$name'
soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
library_names_spec='$libname.dll.lib'
Expand Down Expand Up @@ -22379,8 +22379,8 @@ fi
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
case $cc_basename in
cl* | icl* | ifort*)
# Native MSVC or ICC or IFORT
cl* | icl* | ifort* | icx* | ifx*)
# Native MSVC or classic or new Intel Compilers
hardcode_libdir_flag_spec_F77=' '
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=yes
Expand Down Expand Up @@ -22421,7 +22421,7 @@ fi
fi'
;;
*)
# Assume MSVC and ICC and IFORT wrapper
# Assume MSVC and Intel compilers wrapper
hardcode_libdir_flag_spec_F77=' '
allow_undefined_flag_F77=unsupported
# Tell ltmain to make .lib files, not .a files.
Expand Down Expand Up @@ -23271,8 +23271,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
dynamic_linker='Win32 ld.exe'
;;

*,cl* | *,icl* | *,ifort*)
# Native MSVC or ICC or IFORT
*,cl* | *,icl* | *,ifort* | *,icx* | *,ifx*)
# Native MSVC or classic or new Intel Compilers
libname_spec='$name'
soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
library_names_spec='$libname.dll.lib'
Expand Down

0 comments on commit d63fe2c

Please sign in to comment.