[Git][ghc/ghc][master] Testsuite: Check if llvm assembler is available for have_llvm

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
4c7ae2a1 by Andreas Klebinger at 2024-05-15T23:07:30-04:00
Testsuite: Check if llvm assembler is available for have_llvm

- - - - -


1 changed file:

- hadrian/src/Settings/Builders/RunTest.hs


Changes:

=====================================
hadrian/src/Settings/Builders/RunTest.hs
=====================================
@@ -127,7 +127,8 @@ inTreeCompilerArgs stg = do
     wordsize    <- show @Int . (*8) <$> queryTargetTarget (wordSize2Bytes . tgtWordSize)
 
     llc_cmd   <- settingsFileSetting ToolchainSetting_LlcCommand
-    have_llvm <- liftIO (isJust <$> findExecutable llc_cmd)
+    llvm_as_cmd <- settingsFileSetting ToolchainSetting_LlvmAsCommand
+    have_llvm <- liftIO (all isJust <$> mapM findExecutable [llc_cmd, llvm_as_cmd])
 
     top         <- topDirectory
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4c7ae2a1c1adcc8267db2c0c5910ffbd6e3394a7

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4c7ae2a1c1adcc8267db2c0c5910ffbd6e3394a7
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240515/564a156b/attachment-0001.html>