Merge pull request #10949 from zlonast/master

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

Author: mergify[bot]

Cabal/src/Distribution/Simple/GHC/Internal.hs

@@ -487,6 +487,7 @@ componentAsmGhcOptions verbosity lbi bi clbi odir filename =
              )
           ++ asmOptions bi
     , ghcOptObjDir = toFlag odir
+    , ghcOptExtra = hcOptions GHC bi
     }
 
 componentJsGhcOptions
@@ -509,6 +510,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
@@ -622,7 +624,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
     }
 

cabal-testsuite/PackageTests/JS/GhcOptions/cabal.project

@@ -0,0 +1 @@
+packages: .

cabal-testsuite/PackageTests/JS/GhcOptions/demo/Main.hs

@@ -0,0 +1,6 @@
+module Main where
+
+import Lib
+
+main :: IO ()
+main = foo

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

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
+}

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

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...

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

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

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
+```
+