Peter Trommler pushed to branch wip/T26819 at Glasgow Haskell Compiler / GHC Commits: 8c18a232 by Peter Trommler at 2026-01-24T16:06:45+01:00 Generate all arguments for preprocessing .S files - - - - - 1 changed file: - hadrian/src/Settings/Builders/Cc.hs Changes: ===================================== hadrian/src/Settings/Builders/Cc.hs ===================================== @@ -18,6 +18,7 @@ ccBuilderArgs = do , arg "-o", arg =<< getOutput ] , builder (Cc (FindCDependencies CDep)) ? findCDepExpr CDep , builder (Cc (FindCDependencies CxxDep)) ? findCDepExpr CxxDep + , builder (Cc (FindCDependencies AsmDep)) ? findCDepExpr AsmDep ] where findCDepExpr depType = do @@ -26,10 +27,10 @@ ccBuilderArgs = do , arg "-MM", arg "-MG" , arg "-MF", arg output , arg "-MT", arg $ dropExtension output -<.> "o" - , case depType of CDep -> mempty; CxxDep -> arg "-std=c++11" + , case depType of CDep -> mempty; CxxDep -> arg "-std=c++11"; AsmDep -> mempty , cIncludeArgs , arg "-x", arg (case depType of CDep -> "c"; CxxDep -> "c++"; AsmDep -> "assembler-with-cpp") - , case depType of CDep -> mempty; CxxDep -> getContextData cxxOpts + , case depType of CDep -> mempty; CxxDep -> getContextData cxxOpts; AsmDep -> mempty -- Pass 'ghcversion.h' to give sources access to the -- `MIN_VERSION_GLASGOW_HASKELL` macro. , notStage0 ? arg "-include" <> arg "rts/include/ghcversion.h" View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8c18a232da18b3dd1d81288799371616... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8c18a232da18b3dd1d81288799371616... You're receiving this email because of your account on gitlab.haskell.org.