if ghc-options is not passed when compiling js, Cmm or asm, that's a bug

zlonast · zlonast · commit 6aeffc247ae2 · 2025-05-08T18:35:58.000+03:00
diff --git a/Cabal/src/Distribution/Simple/GHC/Internal.hs b/Cabal/src/Distribution/Simple/GHC/Internal.hs
@@ -486,6 +486,7 @@ componentAsmGhcOptions verbosity lbi bi clbi odir filename =
              )
           ++ asmOptions bi
     , ghcOptObjDir = toFlag odir
+    , ghcOptExtra = hcOptions GHC bi
     }
 
 componentJsGhcOptions
@@ -508,6 +509,7 @@ componentJsGhcOptions verbosity lbi bi clbi odir filename =
     , ghcOptPackageDBs = withPackageDB lbi
     , ghcOptPackages = toNubListR $ mkGhcOptPackages (promisedPkgs lbi) clbi
     , ghcOptObjDir = toFlag odir
+    , ghcOptExtra = hcOptions GHC bi
     }
 
 componentGhcOptions
@@ -621,7 +623,7 @@ componentCmmGhcOptions verbosity lbi bi clbi odir filename =
     , ghcOptPackages = toNubListR $ mkGhcOptPackages (promisedPkgs lbi) clbi
     , ghcOptOptimisation = toGhcOptimisation (withOptimization lbi)
     , ghcOptDebugInfo = toFlag (withDebugInfo lbi)
-    , ghcOptExtra = cmmOptions bi
+    , ghcOptExtra = hcOptions GHC bi <> cmmOptions bi
     , ghcOptObjDir = toFlag odir
     }
 

Original file line number	Diff line number	Diff line change
`@@ -486,6 +486,7 @@ componentAsmGhcOptions verbosity lbi bi clbi odir filename =`
`486`	`486`	`)`
`487`	`487`	`++ asmOptions bi`
`488`	`488`	`, ghcOptObjDir = toFlag odir`
	`489`	`+ , ghcOptExtra = hcOptions GHC bi`
`489`	`490`	`}`
`490`	`491`
`491`	`492`	`componentJsGhcOptions`
`@@ -508,6 +509,7 @@ componentJsGhcOptions verbosity lbi bi clbi odir filename =`
`508`	`509`	`, ghcOptPackageDBs = withPackageDB lbi`
`509`	`510`	`, ghcOptPackages = toNubListR $ mkGhcOptPackages (promisedPkgs lbi) clbi`
`510`	`511`	`, ghcOptObjDir = toFlag odir`
	`512`	`+ , ghcOptExtra = hcOptions GHC bi`
`511`	`513`	`}`
`512`	`514`
`513`	`515`	`componentGhcOptions`
`@@ -621,7 +623,7 @@ componentCmmGhcOptions verbosity lbi bi clbi odir filename =`
`621`	`623`	`, ghcOptPackages = toNubListR $ mkGhcOptPackages (promisedPkgs lbi) clbi`
`622`	`624`	`, ghcOptOptimisation = toGhcOptimisation (withOptimization lbi)`
`623`	`625`	`, ghcOptDebugInfo = toFlag (withDebugInfo lbi)`
`624`		`- , ghcOptExtra = cmmOptions bi`
	`626`	`+ , ghcOptExtra = hcOptions GHC bi <> cmmOptions bi`
`625`	`627`	`, ghcOptObjDir = toFlag odir`
`626`	`628`	`}`
`627`	`629`