RISC-V: Explicitly call python when using multilib generator
authorSimon Cook <simon.cook@embecosm.com>
Wed, 9 Dec 2020 10:39:28 +0000 (10:39 +0000)
committerKito Cheng <kito.cheng@sifive.com>
Thu, 10 Dec 2020 09:11:41 +0000 (17:11 +0800)
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

index 53c51dfa53f1df0b9a94fd681dbaa48a23cf0d37..ccfd9ea18ea3103d0b7800d6f6db8d5f7aa55559 100755 (executable)
@@ -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([sys.executable, arch_can_script, arch],
+                          stdout=subprocess.PIPE)
   out, err = proc.communicate()
   return out.strip()