From 750846cd2c51613d2bbd0029a304d07fae2c2972 Mon Sep 17 00:00:00 2001
From: Zubin Duggal <zubin.duggal@gmail.com>
Date: Wed, 27 Jul 2022 16:29:07 +0530
Subject: Pass correct package db when testing stage1.

It used to pick the db for stage-2 which obviously didn't work.
---
 hadrian/src/Rules/Test.hs       | 2 +-
 hadrian/src/Settings/Default.hs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'hadrian')

diff --git a/hadrian/src/Rules/Test.hs b/hadrian/src/Rules/Test.hs
index abe78b79ab..f1fb204c88 100644
--- a/hadrian/src/Rules/Test.hs
+++ b/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
diff --git a/hadrian/src/Settings/Default.hs b/hadrian/src/Settings/Default.hs
index c6f23b55a7..8e8729544b 100644
--- a/hadrian/src/Settings/Default.hs
+++ b/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]
-- 
cgit v1.2.1