Skip to content

Commit 574e878

Browse files
committed
rerun autotools
1 parent 24a2a13 commit 574e878

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

compile

Lines changed: 2 additions & 0 deletions
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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3211,7 +3211,7 @@ else case e in #(
32113211
e) enable_msvc=no
32123212
case $build in
32133213
*-mingw* | *-cygwin* | *-msys* )
3214-
for ac_prog in gcc clang icl cl
3214+
for ac_prog in gcc clang icx icl cl
32153215
do
32163216
# Extract the first word of "$ac_prog", so it can be a program name with args.
32173217
set dummy $ac_prog; ac_word=$2
@@ -3259,7 +3259,7 @@ fi
32593259
test -n "$CC" && break
32603260
done
32613261

3262-
case "$CC" in *cl ) enable_msvc=yes ;; esac
3262+
case "$CC" in *cl | *icx ) enable_msvc=yes ;; esac
32633263
;;
32643264
esac ;;
32653265
esac
@@ -4298,7 +4298,7 @@ fi
42984298

42994299

43004300
if test $enable_msvc = yes ; then
4301-
for ac_prog in icl cl
4301+
for ac_prog in icx icl cl
43024302
do
43034303
# Extract the first word of "$ac_prog", so it can be a program name with args.
43044304
set dummy $ac_prog; ac_word=$2
@@ -4362,7 +4362,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
43624362
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
43634363
ac_compiler_gnu=$ac_cv_c_compiler_gnu
43644364
if test -n "$ac_tool_prefix"; then
4365-
for ac_prog in gcc clang cc icc icl cl cc xlc xlc_r pgcc
4365+
for ac_prog in gcc clang cc icx icc icl cl cc xlc xlc_r pgcc
43664366
do
43674367
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
43684368
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -4412,7 +4412,7 @@ fi
44124412
fi
44134413
if test -z "$CC"; then
44144414
ac_ct_CC=$CC
4415-
for ac_prog in gcc clang cc icc icl cl cc xlc xlc_r pgcc
4415+
for ac_prog in gcc clang cc icx icc icl cl cc xlc xlc_r pgcc
44164416
do
44174417
# Extract the first word of "$ac_prog", so it can be a program name with args.
44184418
set dummy $ac_prog; ac_word=$2
@@ -5256,7 +5256,7 @@ fi
52565256

52575257

52585258
if test $enable_msvc = yes ; then
5259-
for ac_prog in icl cl
5259+
for ac_prog in icx icl cl
52605260
do
52615261
# Extract the first word of "$ac_prog", so it can be a program name with args.
52625262
set dummy $ac_prog; ac_word=$2
@@ -5324,7 +5324,7 @@ if test -z "$CXX"; then
53245324
CXX=$CCC
53255325
else
53265326
if test -n "$ac_tool_prefix"; then
5327-
for ac_prog in g++ clang++ c++ pgCC icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
5327+
for ac_prog in g++ clang++ c++ pgCC icx icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
53285328
do
53295329
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
53305330
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -5374,7 +5374,7 @@ fi
53745374
fi
53755375
if test -z "$CXX"; then
53765376
ac_ct_CXX=$CXX
5377-
for ac_prog in g++ clang++ c++ pgCC icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
5377+
for ac_prog in g++ clang++ c++ pgCC icx icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
53785378
do
53795379
# Extract the first word of "$ac_prog", so it can be a program name with args.
53805380
set dummy $ac_prog; ac_word=$2
@@ -12210,8 +12210,8 @@ fi
1221012210
# hardcode_libdir_flag_spec is actually meaningless, as there is
1221112211
# no search path for DLLs.
1221212212
case $cc_basename in
12213-
cl* | icl* | ifort*)
12214-
# Native MSVC or ICC or IFORT
12213+
cl* | icl* | ifort* | icx* | ifx*)
12214+
# Native MSVC or classic or new Intel Compilers
1221512215
hardcode_libdir_flag_spec=' '
1221612216
allow_undefined_flag=unsupported
1221712217
always_export_symbols=yes
@@ -12252,7 +12252,7 @@ fi
1225212252
fi'
1225312253
;;
1225412254
*)
12255-
# Assume MSVC and ICC and IFORT wrapper
12255+
# Assume MSVC and Intel compilers wrapper
1225612256
hardcode_libdir_flag_spec=' '
1225712257
allow_undefined_flag=unsupported
1225812258
# Tell ltmain to make .lib files, not .a files.
@@ -13313,8 +13313,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
1331313313
dynamic_linker='Win32 ld.exe'
1331413314
;;
1331513315

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

1596815968
cygwin* | mingw* | windows* | pw32* | cegcc*)
1596915969
case $GXX,$cc_basename in
15970-
,cl* | no,cl* | ,icl* | no,icl* | ,ifort* | no,ifort* )
15971-
# Native MSVC or ICC or IFORT
15970+
,cl* | no,cl* | ,icl* | no,icl* | ,ifort* | no,ifort* | ,icx* | no,icx* | ,ifx* | no,ifx*)
15971+
# Native MSVC or classic or new Intel compilers
1597215972
# hardcode_libdir_flag_spec is actually meaningless, as there is
1597315973
# no search path for DLLs.
1597415974
hardcode_libdir_flag_spec_CXX=' '
@@ -17565,7 +17565,7 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries
1756517565
;;
1756617566
cygwin* | mingw* | windows* | cegcc*)
1756717567
case $cc_basename in
17568-
cl* | icl* | ifort*)
17568+
cl* | icl* | ifort* | icx* | ifx*)
1756917569
exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
1757017570
;;
1757117571
*)
@@ -17943,8 +17943,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
1794317943
dynamic_linker='Win32 ld.exe'
1794417944
;;
1794517945

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

0 commit comments

Comments
 (0)