Merge pull request #10417 from haskell/wip/t10416

Fix ./setup install comand
haskell · Oct 6, 2024 · 47139c5 · 47139c5
2 parents b1e842d + 2a178f2
commit 47139c5
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 0 deletions.
diff --git a/Cabal/src/Distribution/Simple.hs b/Cabal/src/Distribution/Simple.hs
@@ -1094,6 +1094,7 @@ defaultInstallHook_setupHooks inst_hooks pkg_descr localbuildinfo _ flags = do
         defaultRegisterFlags
           { regInPlace = installInPlace flags
           , regPackageDB = installPackageDB flags
+          , registerCommonFlags = installCommonFlags flags
           }
   when (hasLibs pkg_descr) $
     register pkg_descr localbuildinfo registerFlags

diff --git a/cabal-testsuite/PackageTests/Install/DistPrefInstall/CHANGELOG.md b/cabal-testsuite/PackageTests/Install/DistPrefInstall/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Revision history for DistPrefInstall
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.
diff --git a/cabal-testsuite/PackageTests/Install/DistPrefInstall/DistPrefInstall.cabal b/cabal-testsuite/PackageTests/Install/DistPrefInstall/DistPrefInstall.cabal
@@ -0,0 +1,18 @@
+cabal-version:   3.12
+name:            DistPrefInstall
+version:         0.1.0.0
+license:         NONE
+author:          Matthew Pickering
+maintainer:      [email protected]
+build-type:      Simple
+extra-doc-files: CHANGELOG.md
+
+common warnings
+    ghc-options: -Wall
+
+library
+    import:           warnings
+    exposed-modules:  MyLib
+    build-depends:    base
+    hs-source-dirs:   src
+    default-language: Haskell2010
diff --git a/cabal-testsuite/PackageTests/Install/DistPrefInstall/Setup.hs b/cabal-testsuite/PackageTests/Install/DistPrefInstall/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/cabal-testsuite/PackageTests/Install/DistPrefInstall/setup.test.hs b/cabal-testsuite/PackageTests/Install/DistPrefInstall/setup.test.hs
@@ -0,0 +1,8 @@
+import Test.Cabal.Prelude
+
+main = setupTest $ recordMode DoNotRecord $ withPackageDb $ do
+    setup "configure" []
+    setup "build" []
+    setup "copy" []
+    setup "install" []
+    setup "sdist" []
diff --git a/cabal-testsuite/PackageTests/Install/DistPrefInstall/src/MyLib.hs b/cabal-testsuite/PackageTests/Install/DistPrefInstall/src/MyLib.hs
@@ -0,0 +1,4 @@
+module MyLib (someFunc) where
+
+someFunc :: IO ()
+someFunc = putStrLn "someFunc"
diff --git a/changelog.d/t10416 b/changelog.d/t10416
@@ -0,0 +1,11 @@
+synopsis: Fix ./setup install command
+packages: Cabal
+prs: #10417
+issues: #10416
+significance: significant
+
+description: {
+
+- `./setup install` was failing with a `fromFlag NoFlag` error. It is now fixed.
+
+}