Skip to content

Commit d63fe2c

Browse files
committed
rerun autotools
1 parent 5bb5948 commit d63fe2c

File tree

3 files changed

+29
-27
lines changed

3 files changed

+29
-27
lines changed

ChangeLog.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ More detailed information about incremental changes can be found in the
1717
(POSIX systems) or SIGINT/SIGTERM/SIGABRT (Windows systems).
1818
- New option `mumps_mpi_communicator` to specify the MPI communicator when using
1919
an MPI-enabled build of MUMPS [#790, by Alex Tyler Chapman].
20-
- Updated build system to current autotools versions.
20+
- Updated build system to current autotools versions; initial support for icx/ifx and flang
2121

2222
### 3.14.16 (2024-04-22)
2323

compile

+2
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,8 @@ EOF
295295
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
296296
clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \
297297
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe | \
298+
icx | *[/\\]icx | icx.exe | *[/\\]icx.exe | \
299+
ifx | *[/\\]ifx | ifx.exe | *[/\\]ifx.exe | \
298300
ifort | *[/\\]ifort | ifort.exe | *[/\\]ifort.exe )
299301
func_cl_wrapper "$@" # Doesn't return...
300302
;;

configure

+26-26
Original file line numberDiff line numberDiff line change
@@ -3730,7 +3730,7 @@ else case e in #(
37303730
e) enable_msvc=no
37313731
case $build in
37323732
*-mingw* | *-cygwin* | *-msys* )
3733-
for ac_prog in gcc clang icl cl
3733+
for ac_prog in gcc clang icx icl cl
37343734
do
37353735
# Extract the first word of "$ac_prog", so it can be a program name with args.
37363736
set dummy $ac_prog; ac_word=$2
@@ -3778,7 +3778,7 @@ fi
37783778
test -n "$CC" && break
37793779
done
37803780

3781-
case "$CC" in *cl ) enable_msvc=yes ;; esac
3781+
case "$CC" in *cl | *icx ) enable_msvc=yes ;; esac
37823782
;;
37833783
esac ;;
37843784
esac
@@ -4817,7 +4817,7 @@ fi
48174817

48184818

48194819
if test $enable_msvc = yes ; then
4820-
for ac_prog in icl cl
4820+
for ac_prog in icx icl cl
48214821
do
48224822
# Extract the first word of "$ac_prog", so it can be a program name with args.
48234823
set dummy $ac_prog; ac_word=$2
@@ -4881,7 +4881,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
48814881
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
48824882
ac_compiler_gnu=$ac_cv_c_compiler_gnu
48834883
if test -n "$ac_tool_prefix"; then
4884-
for ac_prog in gcc clang cc icc icl cl cc xlc xlc_r pgcc
4884+
for ac_prog in gcc clang cc icx icc icl cl cc xlc xlc_r pgcc
48854885
do
48864886
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
48874887
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -4931,7 +4931,7 @@ fi
49314931
fi
49324932
if test -z "$CC"; then
49334933
ac_ct_CC=$CC
4934-
for ac_prog in gcc clang cc icc icl cl cc xlc xlc_r pgcc
4934+
for ac_prog in gcc clang cc icx icc icl cl cc xlc xlc_r pgcc
49354935
do
49364936
# Extract the first word of "$ac_prog", so it can be a program name with args.
49374937
set dummy $ac_prog; ac_word=$2
@@ -5775,7 +5775,7 @@ fi
57755775

57765776

57775777
if test $enable_msvc = yes ; then
5778-
for ac_prog in icl cl
5778+
for ac_prog in icx icl cl
57795779
do
57805780
# Extract the first word of "$ac_prog", so it can be a program name with args.
57815781
set dummy $ac_prog; ac_word=$2
@@ -5843,7 +5843,7 @@ if test -z "$CXX"; then
58435843
CXX=$CCC
58445844
else
58455845
if test -n "$ac_tool_prefix"; then
5846-
for ac_prog in g++ clang++ c++ pgCC icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
5846+
for ac_prog in g++ clang++ c++ pgCC icx icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
58475847
do
58485848
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
58495849
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -5893,7 +5893,7 @@ fi
58935893
fi
58945894
if test -z "$CXX"; then
58955895
ac_ct_CXX=$CXX
5896-
for ac_prog in g++ clang++ c++ pgCC icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
5896+
for ac_prog in g++ clang++ c++ pgCC icx icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
58975897
do
58985898
# Extract the first word of "$ac_prog", so it can be a program name with args.
58995899
set dummy $ac_prog; ac_word=$2
@@ -6442,7 +6442,7 @@ fi
64426442
# first in PATH, which causes compile and link checks to fail.)
64436443
# For the same reason, set LD to use the compile wrapper.
64446444
if test $enable_msvc = yes ; then
6445-
for ac_prog in ifort
6445+
for ac_prog in ifx ifort
64466446
do
64476447
# Extract the first word of "$ac_prog", so it can be a program name with args.
64486448
set dummy $ac_prog; ac_word=$2
@@ -6506,7 +6506,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
65066506
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
65076507
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
65086508
if test -n "$ac_tool_prefix"; then
6509-
for ac_prog in gfortran ifort g95 fort77 f77 f95 f90 g77 pgf90 pgf77 ifc frt af77 xlf_r fl32
6509+
for ac_prog in gfortran ifx ifort flang g95 fort77 f77 f95 f90 g77 pgf90 pgf77 ifc frt af77 xlf_r fl32
65106510
do
65116511
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
65126512
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -6556,7 +6556,7 @@ fi
65566556
fi
65576557
if test -z "$F77"; then
65586558
ac_ct_F77=$F77
6559-
for ac_prog in gfortran ifort g95 fort77 f77 f95 f90 g77 pgf90 pgf77 ifc frt af77 xlf_r fl32
6559+
for ac_prog in gfortran ifx ifort flang g95 fort77 f77 f95 f90 g77 pgf90 pgf77 ifc frt af77 xlf_r fl32
65606560
do
65616561
# Extract the first word of "$ac_prog", so it can be a program name with args.
65626562
set dummy $ac_prog; ac_word=$2
@@ -13911,8 +13911,8 @@ fi
1391113911
# hardcode_libdir_flag_spec is actually meaningless, as there is
1391213912
# no search path for DLLs.
1391313913
case $cc_basename in
13914-
cl* | icl* | ifort*)
13915-
# Native MSVC or ICC or IFORT
13914+
cl* | icl* | ifort* | icx* | ifx*)
13915+
# Native MSVC or classic or new Intel Compilers
1391613916
hardcode_libdir_flag_spec=' '
1391713917
allow_undefined_flag=unsupported
1391813918
always_export_symbols=yes
@@ -13953,7 +13953,7 @@ fi
1395313953
fi'
1395413954
;;
1395513955
*)
13956-
# Assume MSVC and ICC and IFORT wrapper
13956+
# Assume MSVC and Intel compilers wrapper
1395713957
hardcode_libdir_flag_spec=' '
1395813958
allow_undefined_flag=unsupported
1395913959
# Tell ltmain to make .lib files, not .a files.
@@ -15014,8 +15014,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
1501415014
dynamic_linker='Win32 ld.exe'
1501515015
;;
1501615016

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

1773317733
cygwin* | mingw* | windows* | pw32* | cegcc*)
1773417734
case $GXX,$cc_basename in
17735-
,cl* | no,cl* | ,icl* | no,icl* | ,ifort* | no,ifort* )
17736-
# Native MSVC or ICC or IFORT
17735+
,cl* | no,cl* | ,icl* | no,icl* | ,ifort* | no,ifort* | ,icx* | no,icx* | ,ifx* | no,ifx*)
17736+
# Native MSVC or classic or new Intel compilers
1773717737
# hardcode_libdir_flag_spec is actually meaningless, as there is
1773817738
# no search path for DLLs.
1773917739
hardcode_libdir_flag_spec_CXX=' '
@@ -19330,7 +19330,7 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries
1933019330
;;
1933119331
cygwin* | mingw* | windows* | cegcc*)
1933219332
case $cc_basename in
19333-
cl* | icl* | ifort*)
19333+
cl* | icl* | ifort* | icx* | ifx*)
1933419334
exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
1933519335
;;
1933619336
*)
@@ -19708,8 +19708,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
1970819708
dynamic_linker='Win32 ld.exe'
1970919709
;;
1971019710

19711-
*,cl* | *,icl* | *,ifort*)
19712-
# Native MSVC or ICC or IFORT
19711+
*,cl* | *,icl* | *,ifort* | *,icx* | *,ifx*)
19712+
# Native MSVC or classic or new Intel Compilers
1971319713
libname_spec='$name'
1971419714
soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
1971519715
library_names_spec='$libname.dll.lib'
@@ -22379,8 +22379,8 @@ fi
2237922379
# hardcode_libdir_flag_spec is actually meaningless, as there is
2238022380
# no search path for DLLs.
2238122381
case $cc_basename in
22382-
cl* | icl* | ifort*)
22383-
# Native MSVC or ICC or IFORT
22382+
cl* | icl* | ifort* | icx* | ifx*)
22383+
# Native MSVC or classic or new Intel Compilers
2238422384
hardcode_libdir_flag_spec_F77=' '
2238522385
allow_undefined_flag_F77=unsupported
2238622386
always_export_symbols_F77=yes
@@ -22421,7 +22421,7 @@ fi
2242122421
fi'
2242222422
;;
2242322423
*)
22424-
# Assume MSVC and ICC and IFORT wrapper
22424+
# Assume MSVC and Intel compilers wrapper
2242522425
hardcode_libdir_flag_spec_F77=' '
2242622426
allow_undefined_flag_F77=unsupported
2242722427
# Tell ltmain to make .lib files, not .a files.
@@ -23271,8 +23271,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
2327123271
dynamic_linker='Win32 ld.exe'
2327223272
;;
2327323273

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

0 commit comments

Comments
 (0)