Skip to content

gh-96398: Improve accuracy of compiler checks in configure.ac #117815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erlend-aasland merged 20 commits into from
Nov 7, 2024
+127 −203
Merged

gh-96398: Improve accuracy of compiler checks in configure.ac #117815

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4a55006
gh-96398: Consistently use $ac_cv_cc_name for compiler checks in conf…
erlend-aasland Apr 12, 2024
3e03fe4
Bring back the mpicc
erlend-aasland Apr 12, 2024
2305a7b
Detect emcc
erlend-aasland Apr 12, 2024
444b92d
Pull in main
erlend-aasland Apr 12, 2024
1077ec3
gh-96398: Detect GCC compatible compilers in configure
erlend-aasland Apr 12, 2024
aeed46f
Use ac_cv_gcc_compat where possible
erlend-aasland Apr 12, 2024
cc3731f
Pull in main
erlend-aasland Apr 12, 2024
a614de5
syntax
erlend-aasland Apr 12, 2024
c55d838
;;
erlend-aasland Apr 12, 2024
b249323
regen ac
erlend-aasland Apr 12, 2024
00cb06c
Merge branch 'main' into autoconf/cc
erlend-aasland Apr 13, 2024
474d5f9
Merge branch 'main' into autoconf/cc
erlend-aasland Apr 13, 2024
f327791
gh-96398: Fix mpicc check in configure.ac
erlend-aasland Apr 13, 2024
c6e50b9
Bring back CC_BASENAME and use it for tool detection
erlend-aasland Apr 13, 2024
f33f1f5
Use CC_BASENAME to simplify mpicc check
erlend-aasland Apr 13, 2024
033e017
Pull in main
erlend-aasland Apr 13, 2024
0df909e
Pull in main
erlend-aasland Oct 14, 2024
d309996
Merge branch 'main' into autoconf/cc
erlend-aasland Oct 27, 2024
c6fa062
Pull in main
erlend-aasland Oct 28, 2024
9900633
Address Malcom's review
erlend-aasland Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use CC_BASENAME to simplify mpicc check
  • Loading branch information
@erlend-aasland
erlend-aasland committed Apr 13, 2024
commit f33f1f50b7883070d8396046f2548bd4db2fa4c8
11 changes: 7 additions & 4 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,6 +986,9 @@ AC_PROG_GREP
AC_PROG_SED
AC_PROG_EGREP

dnl GNU Autoconf recommends the use of expr instead of basename.
AS_VAR_SET([CC_BASENAME], [$(expr "//$CC" : '.*/\(.*\)')])

dnl detect compiler name
dnl check for xlc before clang, newer xlc's can use clang as frontend.
dnl check for GCC last, other compilers set __GNUC__, too.
Expand All @@ -1011,9 +1014,7 @@ EOF

if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then
ac_cv_cc_name=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '`
if test $(expr "//$CC" : '.*/\(.*\)') = "mpicc"; then
ac_cv_cc_name="mpicc"
fi
AS_VAR_IF([CC_BASENAME], [mpicc], [ac_cv_cc_name=mpicc])
else
ac_cv_cc_name="unknown"
fi
Expand All @@ -1037,10 +1038,6 @@ AC_CACHE_CHECK([for GCC compatible compiler],
[ac_cv_gcc_compat=yes],
[ac_cv_gcc_compat=no])])


dnl GNU Autoconf recommends the use of expr instead of basename.
AS_VAR_SET([CC_BASENAME], [$(expr "//$CC" : '.*/\(.*\)')])

AC_SUBST([CXX])

preset_cxx="$CXX"
Expand Down