On 12/9/20 3:03 PM, Simon Cook wrote: > When building GCC for RISC-V with the --with-multilib-generator option, > it may not be possible to call arch-canonicalize as an executable when > building on Windows. Instead directly invoke the expected python > interpreter for this step. > > gcc/ChangeLog: > > * config/riscv/multilib-generator (arch_canonicalize): Invoke > python interpreter when calling arch-canonicalize script. > --- > gcc/config/riscv/multilib-generator | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/gcc/config/riscv/multilib-generator > b/gcc/config/riscv/multilib-generator > index 53c51dfa53f..79948518118 100755 > --- a/gcc/config/riscv/multilib-generator > +++ b/gcc/config/riscv/multilib-generator > @@ -54,7 +54,8 @@ def arch_canonicalize(arch): > this_file = os.path.abspath(os.path.join( __file__)) > arch_can_script = \ > os.path.join(os.path.dirname(this_file), "arch-canonicalize") > - proc = subprocess.Popen([arch_can_script, arch], stdout=subprocess.PIPE) > + proc = subprocess.Popen(['python', arch_can_script, arch], > + stdout=subprocess.PIPE) > out, err = proc.communicate() > return out.strip() >
that's again hard-coding 'python'.