]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
PR target/98152: Checking python is available before using
authorKito Cheng <kito.cheng@sifive.com>
Sun, 6 Dec 2020 03:39:22 +0000 (11:39 +0800)
committerKito Cheng <kito.cheng@sifive.com>
Tue, 8 Dec 2020 07:38:02 +0000 (15:38 +0800)
We'll try to canonicalize the arch string for --with-arch,
and the script is written in python, however it will turns out
GCC require python to build for RISC-V port, it's not expect as
the GCC requirement.

So this patch is made this as optional, detect python and only use it
when it available, it won't break any functionality with out doing
canonicalization, just might build one more redundant multi-lib.

gcc/ChangeLog:

PR target/98152
* config.gcc (riscv*-*-*): Checking python, python3 or python2
is available, and skip doing with_arch canonicalize if no python
available.

gcc/config.gcc

index 9c7604481f150dbf472dbc4d37c67fe2da4f5a74..3650b46734a02f53fc7f47ca23e25ab53f9b22cd 100644 (file)
@@ -4623,7 +4623,10 @@ case "${target}" in
                        exit 1
                        ;;
                esac
-               with_arch=`${srcdir}/config/riscv/arch-canonicalize ${with_arch}`
+               PYTHON=`which python || which python3 || which python2`
+               if test "x${PYTHON}" != x; then
+                       with_arch=`${PYTHON} ${srcdir}/config/riscv/arch-canonicalize ${with_arch}`
+               fi
                tm_defines="${tm_defines} TARGET_RISCV_DEFAULT_ARCH=${with_arch}"
 
                # Make sure --with-abi is valid.  If it was not specified,