Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From 9f68a27eb34394a00f1011c06900c609f15fb15c Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Mon, 22 Oct 2018 15:19:51 +0800 |
| 4 | Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler |
| 5 | |
| 6 | When working path contains "clang"/"gcc"/"icc", it might be part of $CC |
| 7 | because of the "--sysroot" parameter. That could cause judgement error |
| 8 | about clang/gcc/icc compilers. e.g. |
| 9 | When "icc" is containded in working path, below errors are reported when |
| 10 | compiling python3: |
| 11 | x86_64-wrs-linux-gcc: error: strict: No such file or directory |
| 12 | x86_64-wrs-linux-gcc: error: unrecognized command line option '-fp-model' |
| 13 | |
| 14 | Here use cc_basename to replace CC for checking compiler to avoid such |
| 15 | kind of issue. |
| 16 | |
| 17 | Upstream-Status: Pending |
| 18 | |
| 19 | Signed-off-by: Li Zhou <li.zhou@windriver.com> |
| 20 | |
| 21 | patch originally from Li Zhou, I just rework it to new version |
| 22 | |
| 23 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 24 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 25 | --- |
| 26 | configure.ac | 19 ++++++++++--------- |
| 27 | 1 file changed, 10 insertions(+), 9 deletions(-) |
| 28 | |
| 29 | diff --git a/configure.ac b/configure.ac |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 30 | index 0c06914..299786b 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 31 | --- a/configure.ac |
| 32 | +++ b/configure.ac |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 33 | @@ -61,6 +61,7 @@ AC_CONFIG_HEADER(pyconfig.h) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 34 | AC_CANONICAL_HOST |
| 35 | AC_SUBST(build) |
| 36 | AC_SUBST(host) |
| 37 | +LT_INIT |
| 38 | |
| 39 | # pybuilddir.txt will be created by --generate-posix-vars in the Makefile |
| 40 | rm -f pybuilddir.txt |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 41 | @@ -688,7 +689,7 @@ AC_MSG_RESULT($with_cxx_main) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 42 | preset_cxx="$CXX" |
| 43 | if test -z "$CXX" |
| 44 | then |
| 45 | - case "$CC" in |
| 46 | + case "$cc_basename" in |
| 47 | gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;; |
| 48 | cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;; |
| 49 | clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;; |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 50 | @@ -976,7 +977,7 @@ rmdir CaseSensitiveTestDir |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 51 | |
| 52 | case $ac_sys_system in |
| 53 | hp*|HP*) |
| 54 | - case $CC in |
| 55 | + case $cc_basename in |
| 56 | cc|*/cc) CC="$CC -Ae";; |
| 57 | esac;; |
| 58 | esac |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 59 | @@ -1374,7 +1375,7 @@ else |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 60 | fi], |
| 61 | [AC_MSG_RESULT(no)]) |
| 62 | if test "$Py_LTO" = 'true' ; then |
| 63 | - case $CC in |
| 64 | + case $cc_basename in |
| 65 | *clang*) |
| 66 | AC_SUBST(LLVM_AR) |
Brad Bishop | 1d80a2e | 2019-11-15 16:35:03 -0500 | [diff] [blame] | 67 | AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path}) |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 68 | @@ -1467,7 +1468,7 @@ then |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 69 | fi |
| 70 | fi |
| 71 | LLVM_PROF_ERR=no |
| 72 | -case $CC in |
| 73 | +case $cc_basename in |
| 74 | *clang*) |
| 75 | # Any changes made here should be reflected in the GCC+Darwin case below |
| 76 | PGO_PROF_GEN_FLAG="-fprofile-instr-generate" |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 77 | @@ -1528,7 +1529,7 @@ esac |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 78 | # compiler and platform. BASECFLAGS tweaks need to be made even if the |
| 79 | # user set OPT. |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 80 | |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 81 | -case $CC in |
| 82 | +case $cc_basename in |
| 83 | *clang*) |
| 84 | cc_is_clang=1 |
| 85 | ;; |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 86 | @@ -1664,7 +1665,7 @@ yes) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 87 | |
| 88 | # ICC doesn't recognize the option, but only emits a warning |
| 89 | ## XXX does it emit an unused result warning and can it be disabled? |
| 90 | - case "$CC" in |
| 91 | + case "$cc_basename" in |
| 92 | *icc*) |
| 93 | ac_cv_disable_unused_result_warning=no |
| 94 | ;; |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 95 | @@ -2018,7 +2019,7 @@ yes) |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 96 | ;; |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 97 | esac |
| 98 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 99 | -case "$CC" in |
| 100 | +case "$cc_basename" in |
| 101 | *icc*) |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 102 | # ICC needs -fp-model strict or floats behave badly |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 103 | CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict" |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 104 | @@ -2836,7 +2837,7 @@ then |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 105 | then |
| 106 | LINKFORSHARED="-Wl,--export-dynamic" |
| 107 | fi;; |
| 108 | - SunOS/5*) case $CC in |
| 109 | + SunOS/5*) case $cc_basename in |
| 110 | *gcc*) |
| 111 | if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null |
| 112 | then |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 113 | @@ -5622,7 +5623,7 @@ if test "$have_gcc_asm_for_x87" = yes; then |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 114 | # Some versions of gcc miscompile inline asm: |
| 115 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 |
| 116 | # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html |
| 117 | - case $CC in |
| 118 | + case $cc_basename in |
| 119 | *gcc*) |
| 120 | AC_MSG_CHECKING(for gcc ipa-pure-const bug) |
| 121 | saved_cflags="$CFLAGS" |