Skip to content

Commit 2f66da1

Browse files
mpickeringMarge Bot
authored andcommitted
Update bootstrap plans for ghc-platform and ghc-toolchain dependencies
Fixes #23735
1 parent 25d4fee commit 2f66da1

15 files changed

+138
-8
lines changed

hadrian/bootstrap/bootstrap.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,10 @@ def resolve_dep(dep : BootstrapDep) -> Path:
175175
elif dep.source == PackageSource.LOCAL:
176176
if dep.package == 'hadrian':
177177
sdist_dir = Path(sys.path[0]).parent.resolve()
178+
elif dep.package == 'ghc-toolchain':
179+
sdist_dir = Path(sys.path[0]).parent.parent.resolve() / f'utils' / f'ghc-toolchain'
180+
elif dep.package == 'ghc-platform':
181+
sdist_dir = Path(sys.path[0]).parent.parent.resolve() / f'libraries' / f'ghc-platform'
178182
else:
179183
raise ValueError(f'Unknown local package {dep.package}')
180184
return sdist_dir
@@ -341,7 +345,7 @@ def fetch_from_plan(plan : FetchPlan, output_dir : Path):
341345
def gen_fetch_plan(info : BootstrapInfo) -> FetchPlan :
342346
sources_dict = {}
343347
for dep in info.dependencies:
344-
if dep.package != 'hadrian':
348+
if not dep.package in ['hadrian', 'ghc-platform', 'ghc-toolchain']:
345349
sources_dict[f"{dep.package}-{dep.version}.tar.gz"] = FetchInfo(package_url(dep.package, dep.version), dep.src_sha256)
346350
if dep.revision is not None:
347351
sources_dict[f"{dep.package}.cabal"] = FetchInfo(package_cabal_url(dep.package, dep.version, dep.revision), dep.cabal_sha256)

hadrian/bootstrap/plan-9_4_1.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

hadrian/bootstrap/plan-9_4_2.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

hadrian/bootstrap/plan-9_4_3.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

hadrian/bootstrap/plan-9_4_4.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

hadrian/bootstrap/plan-9_4_5.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

hadrian/bootstrap/plan-9_6_1.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

hadrian/bootstrap/plan-9_6_2.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

hadrian/bootstrap/plan-bootstrap-9_4_1.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,24 @@
176176
"src_sha256": "cc445d439ea2f65cac7604d3578aa2c3a62e5a91dc989f4ce5b3390db9e59636",
177177
"version": "0.1.3"
178178
},
179+
{
180+
"cabal_sha256": null,
181+
"flags": [],
182+
"package": "ghc-platform",
183+
"revision": null,
184+
"source": "local",
185+
"src_sha256": null,
186+
"version": "0.1.0.0"
187+
},
188+
{
189+
"cabal_sha256": null,
190+
"flags": [],
191+
"package": "ghc-toolchain",
192+
"revision": null,
193+
"source": "local",
194+
"src_sha256": null,
195+
"version": "0.1.0.0"
196+
},
179197
{
180198
"cabal_sha256": "585792335d5541dba78fa8dfcb291a89cd5812a281825ff7a44afa296ab5d58a",
181199
"flags": [

hadrian/bootstrap/plan-bootstrap-9_4_2.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,24 @@
176176
"src_sha256": "cc445d439ea2f65cac7604d3578aa2c3a62e5a91dc989f4ce5b3390db9e59636",
177177
"version": "0.1.3"
178178
},
179+
{
180+
"cabal_sha256": null,
181+
"flags": [],
182+
"package": "ghc-platform",
183+
"revision": null,
184+
"source": "local",
185+
"src_sha256": null,
186+
"version": "0.1.0.0"
187+
},
188+
{
189+
"cabal_sha256": null,
190+
"flags": [],
191+
"package": "ghc-toolchain",
192+
"revision": null,
193+
"source": "local",
194+
"src_sha256": null,
195+
"version": "0.1.0.0"
196+
},
179197
{
180198
"cabal_sha256": "585792335d5541dba78fa8dfcb291a89cd5812a281825ff7a44afa296ab5d58a",
181199
"flags": [

0 commit comments

Comments
 (0)