haskell · zlonast · May 12, 2025 · May 17, 2025
diff --git a/Cabal-syntax/src/Distribution/Utils/Generic.hs b/Cabal-syntax/src/Distribution/Utils/Generic.hs
@@ -192,7 +192,7 @@ writeFileAtomic targetPath content = do
         LBS.hPut handle content
         hClose handle
         Exception.catch
-          (renameFile tmpPath targetPath)
+          (replaceFile tmpPath targetPath)
           ( \(_ :: Exception.SomeException) -> do
               copyFile tmpPath targetPath
               removeFile tmpPath

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
     }
 

diff --git a/cabal-testsuite/PackageTests/JS/GhcOptions/cabal.project b/cabal-testsuite/PackageTests/JS/GhcOptions/cabal.project
@@ -0,0 +1 @@
+packages: .
diff --git a/cabal-testsuite/PackageTests/JS/GhcOptions/demo/Main.hs b/cabal-testsuite/PackageTests/JS/GhcOptions/demo/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Lib
+
+main :: IO ()
+main = foo
diff --git a/cabal-testsuite/PackageTests/JS/GhcOptions/js-arch.test.hs b/cabal-testsuite/PackageTests/JS/GhcOptions/js-arch.test.hs
@@ -0,0 +1,9 @@
+import Test.Cabal.Prelude
+
+main = do
+    skipUnlessJavaScript
+    skipIfWindows ""
+    setupAndCabalTest $ do
+        skipUnlessGhcVersion ">= 9.12"
+        res <- cabal' "v2-run" ["demo"]
+        assertOutputContains "Hello definition!" res
diff --git a/cabal-testsuite/PackageTests/JS/GhcOptions/jsbits/lib.js b/cabal-testsuite/PackageTests/JS/GhcOptions/jsbits/lib.js
@@ -0,0 +1,9 @@
+//#OPTIONS: CPP
+
+function foo() {
+#ifdef PRINT_DEF
+  console.log("Hello definition!");
+#else
+  console.log("Hello!");
+#endif
+}
diff --git a/cabal-testsuite/PackageTests/JS/GhcOptions/jsghcoptions.cabal b/cabal-testsuite/PackageTests/JS/GhcOptions/jsghcoptions.cabal
@@ -0,0 +1,19 @@
+cabal-version: 3.0
+name: jsghcoptions
+version: 0
+build-type: Simple
+
+library
+  default-language: Haskell2010
+  js-sources: jsbits/lib.js
+  if arch(JavaScript)
+    ghc-options: -optJSP-DPRINT_DEF
+  hs-source-dirs: src
+  exposed-modules: Lib
+  build-depends: base
+
+executable demo
+  default-language: Haskell2010
+  main-is: Main.hs
+  hs-source-dirs: demo
+  build-depends: base, jsghcoptions
diff --git a/cabal-testsuite/PackageTests/JS/GhcOptions/other-arch.out b/cabal-testsuite/PackageTests/JS/GhcOptions/other-arch.out
@@ -0,0 +1,14 @@
+# cabal v2-run
+Configuration is affected by the following files:
+- cabal.project
+Resolving dependencies...
+Build profile: -w ghc-<GHCVER> -O1
+In order, the following will be built:
+ - jsghcoptions-0 (lib) (first run)
+ - jsghcoptions-0 (exe:demo) (first run)
+Configuring library for jsghcoptions-0...
+Preprocessing library for jsghcoptions-0...
+Building library for jsghcoptions-0...
+Configuring executable 'demo' for jsghcoptions-0...
+Preprocessing executable 'demo' for jsghcoptions-0...
+Building executable 'demo' for jsghcoptions-0...
diff --git a/cabal-testsuite/PackageTests/JS/GhcOptions/other-arch.test.hs b/cabal-testsuite/PackageTests/JS/GhcOptions/other-arch.test.hs
@@ -0,0 +1,8 @@
+import Test.Cabal.Prelude
+
+main = do
+    skipIfJavaScript
+    cabalTest $ do
+        -- Ensure the field `js-sources` does not raise issues
+        res <- cabal' "v2-run" ["demo"]
+        assertOutputContains "Not JS foo" res
diff --git a/cabal-testsuite/PackageTests/JS/GhcOptions/src/Lib.hs b/cabal-testsuite/PackageTests/JS/GhcOptions/src/Lib.hs
@@ -0,0 +1,9 @@
+{-# LANGUAGE CPP #-}
+module Lib where
+
+#if defined(javascript_HOST_ARCH)
+foreign import javascript foo :: IO ()
+#else
+foo :: IO ()
+foo = putStrLn "Not JS foo"
+#endif
diff --git a/cabal.project b/cabal.project
@@ -12,3 +12,13 @@ package cabal-install
 
 package Cabal
   flags: +git-rev
+
+source-repository-package
+  type: git
+  location: https://github.com/zlonast/win32.git
+  tag: 1805af5af1db5131b23b14edf0e2ba8c16e6710f
+
+source-repository-package
+  type: git
+  location: https://github.com/zlonast/directory.git
+  tag: e67c28da0f06d82d1f19dfcc2e0fb51e45a8399b
diff --git a/changelog.d/pr-10949.md b/changelog.d/pr-10949.md
@@ -0,0 +1,13 @@
+---
+synopsis: "ghc-options added to js, cmm and asm"
+packages: [Cabal]
+prs: 10949
+---
+
+Now we have the ability to pass ghc-options flags to all component.
+
+```
+  js-sources: jsbits/lib.js
+  ghc-options: -optJSP-your_flag
+```
+