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
1 changed file:
Changes:
| ... | ... | @@ -18,6 +18,7 @@ ccBuilderArgs = do |
| 18 | 18 | , arg "-o", arg =<< getOutput ]
|
| 19 | 19 | , builder (Cc (FindCDependencies CDep)) ? findCDepExpr CDep
|
| 20 | 20 | , builder (Cc (FindCDependencies CxxDep)) ? findCDepExpr CxxDep
|
| 21 | + , builder (Cc (FindCDependencies AsmDep)) ? findCDepExpr AsmDep
|
|
| 21 | 22 | ]
|
| 22 | 23 | where
|
| 23 | 24 | findCDepExpr depType = do
|
| ... | ... | @@ -26,10 +27,10 @@ ccBuilderArgs = do |
| 26 | 27 | , arg "-MM", arg "-MG"
|
| 27 | 28 | , arg "-MF", arg output
|
| 28 | 29 | , arg "-MT", arg $ dropExtension output -<.> "o"
|
| 29 | - , case depType of CDep -> mempty; CxxDep -> arg "-std=c++11"
|
|
| 30 | + , case depType of CDep -> mempty; CxxDep -> arg "-std=c++11"; AsmDep -> mempty
|
|
| 30 | 31 | , cIncludeArgs
|
| 31 | 32 | , arg "-x", arg (case depType of CDep -> "c"; CxxDep -> "c++"; AsmDep -> "assembler-with-cpp")
|
| 32 | - , case depType of CDep -> mempty; CxxDep -> getContextData cxxOpts
|
|
| 33 | + , case depType of CDep -> mempty; CxxDep -> getContextData cxxOpts; AsmDep -> mempty
|
|
| 33 | 34 | -- Pass 'ghcversion.h' to give sources access to the
|
| 34 | 35 | -- `MIN_VERSION_GLASGOW_HASKELL` macro.
|
| 35 | 36 | , notStage0 ? arg "-include" <> arg "rts/include/ghcversion.h"
|