diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs index c0e7724c9de1f3fcfa9f91ebf2437b15ffb4424d..0157eeca0f0a7259d6c2600b8e623749b619c23a 100644 --- a/hadrian/src/Settings/Builders/RunTest.hs +++ b/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