[fortran] Use flang-to-external-fc instead of flang

[DavidSpickett]

Summary

The bash script that was flang is now called flang-to-external-fc.

[DavidSpickett]

For https://reviews.llvm.org/D125788. See comments there.

[DavidSpickett]

zorg/buildbot/builders/ClangBuilder.py

392

And no this isn't going to be correct. I'm not sure that it ever was because no Windows flang bot runs the testsuite yet. No worse than before at least.

[awarzynski]

Makes sense (just need to update flang-to-gfortran to flang-to-external-fc and wait for D125832 to be merged. Thanks for doing this!

zorg/buildbot/builders/ClangBuilder.py

388

@kiranchandramohan Suggested that we use flang-to-external-fc instead. I've updated D125832 accordingly.

[DavidSpickett]

Use the new name.

[awarzynski]

https://reviews.llvm.org/D125788 has been merged, so this is ready to land.

I know that clang-aarch64-full-2stage started failing after my change - not sure why :( But I suspect that this change will fix it. WDYT?

[DavidSpickett]

If I'm not around to land this myself, go ahead then email Galina (address on this page https://llvm.org/docs/HowToAddABuilder.html) to ask for a buildbot restart to include the change.

[DavidSpickett]

Pushed: https://github.com/llvm/llvm-zorg/commit/6a33c8666f619103a5b733a0e9f73001cfea8f59

[DavidSpickett]

This is now present on the bots:

2022-06-06 05:50:50 INFO:   CMAKE_Fortran_COMPILER: '/home/tcwg-buildbot/worker/clang-aarch64-full-2stage/stage2.install/bin/flang-to-external-fc'

[awarzynski]

In D125796#3559681, @DavidSpickett wrote:

This is now present on the bots:

2022-06-06 05:50:50 INFO:   CMAKE_Fortran_COMPILER: '/home/tcwg-buildbot/worker/clang-aarch64-full-2stage/stage2.install/bin/flang-to-external-fc'

Great, we can get rid of flang then: https://reviews.llvm.org/D125796.

zorg/buildbot/builders/ClangBuilder.py

if stage1_upload_directory:
                           use_pixz_compression=use_pixz_compression,
                           xz_compression_factor=xz_compression_factor)
 
     # Compute the cmake define flag to set the C and C++ compiler to clang. Use
     # clang-cl if we used MSVC for stage1.
     if not vs:
         cc = 'clang'
         cxx = 'clang++'
-        fc = 'flang'
+        fc = 'flang-to-gfortran'
     else:
         cc = 'clang-cl.exe'
         cxx = 'clang-cl.exe'
         fc = 'flang.exe'
 
 
     ############# STAGE 2
     if useTwoStage:
         # We always cleanly build the stage 2. If the compiler has been
         # changed on the stage 1, we cannot trust any of the intermediate file
         # from the old compiler. And if the stage 1 compiler is the same, we
         # should not build in the first place.