bootstrap: Disable -selftest flag from bootstrap plans

This saves on building one dependency (QuickCheck) which is unecessary
for bootstrapping.

Author: mpickering

hadrian/bootstrap/generate_bootstrap_plans

@@ -10,7 +10,7 @@ run() {
   local drv="ghc-$ver"
   echo "$ver"
   nix build -f "$ghcs_nix" $drv
-  (cd ../; rm -r dist-newstyle; cabal build --dry-run hadrian -w bootstrap/result/bin/ghc)
+  (cd ../; rm -r dist-newstyle; cabal build --dry-run hadrian --flags=-selftest -w bootstrap/result/bin/ghc)
   cp ../dist-newstyle/cache/plan.json "plan-$ver.json"
   cabal run --with-ghc-pkg $PWD/boot_ghc/bin/ghc-pkg -w $PWD/boot_ghc/bin/ghc -v0 hadrian-bootstrap-gen -- "plan-$ver.json" | jq --sort-keys | tee "plan-bootstrap-$ver.json"
 }

hadrian/bootstrap/plan-9_4_1.json

@@ -94,38 +94,6 @@
     }
   ],
   "dependencies": [
-    {
-      "cabal_sha256": "db25c2e17967aa6b6046ab8b1b96ba3f344ca59a62b60fb6113d51ea305a3d8e",
-      "flags": [
-        "-optimised-mixer"
-      ],
-      "package": "splitmix",
-      "revision": 2,
-      "source": "hackage",
-      "src_sha256": "6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa",
-      "version": "0.1.0.4"
-    },
-    {
-      "cabal_sha256": "dea1f11e5569332dc6c8efaad1cb301016a5587b6754943a49f9de08ae0e56d9",
-      "flags": [],
-      "package": "random",
-      "revision": 0,
-      "source": "hackage",
-      "src_sha256": "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76",
-      "version": "1.2.1.1"
-    },
-    {
-      "cabal_sha256": "4ce29211223d5e6620ebceba34a3ca9ccf1c10c0cf387d48aea45599222ee5aa",
-      "flags": [
-        "-old-random",
-        "+templatehaskell"
-      ],
-      "package": "QuickCheck",
-      "revision": 0,
-      "source": "hackage",
-      "src_sha256": "d87b6c85696b601175274361fa62217894401e401e150c3c5d4013ac53cd36f3",
-      "version": "2.14.2"
-    },
     {
       "cabal_sha256": "64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a",
       "flags": [],
@@ -251,6 +219,26 @@
       "src_sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
       "version": "0.8.0.0"
     },
+    {
+      "cabal_sha256": "db25c2e17967aa6b6046ab8b1b96ba3f344ca59a62b60fb6113d51ea305a3d8e",
+      "flags": [
+        "-optimised-mixer"
+      ],
+      "package": "splitmix",
+      "revision": 2,
+      "source": "hackage",
+      "src_sha256": "6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa",
+      "version": "0.1.0.4"
+    },
+    {
+      "cabal_sha256": "dea1f11e5569332dc6c8efaad1cb301016a5587b6754943a49f9de08ae0e56d9",
+      "flags": [],
+      "package": "random",
+      "revision": 0,
+      "source": "hackage",
+      "src_sha256": "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76",
+      "version": "1.2.1.1"
+    },
     {
       "cabal_sha256": "9ad8972c2e913c37b1d4f0e1261517fd7a1b8c8a58077e057be69837e3dbaa00",
       "flags": [
@@ -287,7 +275,7 @@
     {
       "cabal_sha256": null,
       "flags": [
-        "+selftest",
+        "-selftest",
         "+threaded"
       ],
       "package": "hadrian",

hadrian/bootstrap/plan-9_4_2.json

@@ -94,38 +94,6 @@
     }
   ],
   "dependencies": [
-    {
-      "cabal_sha256": "db25c2e17967aa6b6046ab8b1b96ba3f344ca59a62b60fb6113d51ea305a3d8e",
-      "flags": [
-        "-optimised-mixer"
-      ],
-      "package": "splitmix",
-      "revision": 2,
-      "source": "hackage",
-      "src_sha256": "6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa",
-      "version": "0.1.0.4"
-    },
-    {
-      "cabal_sha256": "dea1f11e5569332dc6c8efaad1cb301016a5587b6754943a49f9de08ae0e56d9",
-      "flags": [],
-      "package": "random",
-      "revision": 0,
-      "source": "hackage",
-      "src_sha256": "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76",
-      "version": "1.2.1.1"
-    },
-    {
-      "cabal_sha256": "4ce29211223d5e6620ebceba34a3ca9ccf1c10c0cf387d48aea45599222ee5aa",
-      "flags": [
-        "-old-random",
-        "+templatehaskell"
-      ],
-      "package": "QuickCheck",
-      "revision": 0,
-      "source": "hackage",
-      "src_sha256": "d87b6c85696b601175274361fa62217894401e401e150c3c5d4013ac53cd36f3",
-      "version": "2.14.2"
-    },
     {
       "cabal_sha256": "64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a",
       "flags": [],
@@ -251,6 +219,26 @@
       "src_sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
       "version": "0.8.0.0"
     },
+    {
+      "cabal_sha256": "db25c2e17967aa6b6046ab8b1b96ba3f344ca59a62b60fb6113d51ea305a3d8e",
+      "flags": [
+        "-optimised-mixer"
+      ],
+      "package": "splitmix",
+      "revision": 2,
+      "source": "hackage",
+      "src_sha256": "6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa",
+      "version": "0.1.0.4"
+    },
+    {
+      "cabal_sha256": "dea1f11e5569332dc6c8efaad1cb301016a5587b6754943a49f9de08ae0e56d9",
+      "flags": [],
+      "package": "random",
+      "revision": 0,
+      "source": "hackage",
+      "src_sha256": "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76",
+      "version": "1.2.1.1"
+    },
     {
       "cabal_sha256": "9ad8972c2e913c37b1d4f0e1261517fd7a1b8c8a58077e057be69837e3dbaa00",
       "flags": [
@@ -287,7 +275,7 @@
     {
       "cabal_sha256": null,
       "flags": [
-        "+selftest",
+        "-selftest",
         "+threaded"
       ],
       "package": "hadrian",