[Git][ghc/ghc][master] Pass correct package db when testing stage1.

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
750846cd by Zubin Duggal at 2022-10-28T00:49:22-04:00
Pass correct package db when testing stage1.

It used to pick the db for stage-2 which obviously didn't work.

- - - - -


2 changed files:

- hadrian/src/Rules/Test.hs
- hadrian/src/Settings/Default.hs


Changes:

=====================================
hadrian/src/Rules/Test.hs
=====================================
@@ -120,7 +120,7 @@ testRules = do
           writeFile' path $ unlines ["#!/bin/sh",unwords ((abs_prog_path : flags) ++ ["${1+\"$@\"}"])]
           makeExecutable path
       else if prog == "ghc-pkg" then do
-        let flags = ["-no-global-package-db", "--no-user-package-db", "--global-package-db", pkgDb]
+        let flags = ["--no-user-package-db", "--global-package-db", pkgDb]
         writeFile' path $ unlines ["#!/bin/sh",unwords ((abs_prog_path : flags) ++ ["${1+\"$@\"}"])]
         makeExecutable path
       else createFileLink abs_prog_path path


=====================================
hadrian/src/Settings/Default.hs
=====================================
@@ -100,12 +100,12 @@ stage0Packages = do
              , text
              , transformers
              , unlit
+             , hp2ps
              , if winTarget then win32 else unix
              ]
           ++ [ terminfo | not windowsHost, not cross ]
           ++ [ timeout  | windowsHost                ]
           ++ [ touchy   | windowsHost                ]
-          ++ [ hp2ps    | cross                      ]
 
 -- | Packages built in 'Stage1' by default. You can change this in "UserSettings".
 stage1Packages :: Action [Package]



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/750846cd2c51613d2bbd0029a304d07fae2c2972

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/750846cd2c51613d2bbd0029a304d07fae2c2972
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221028/8f18080f/attachment-0001.html>