Skip to content

Commit 858bb6d

Browse files
committed
gel: Populate LD_ env vars when bootstrapping properly
Use runtime deps, not build time deps.
1 parent f00b0f5 commit 858bb6d

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

edgedbpkg/edgedb/__init__.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,15 @@ def get_stdlib_bootstrap_script(self, build: targets.Build) -> str:
462462
"import pathlib, sys; print(pathlib.Path(sys.argv[1]).resolve())"
463463
)
464464

465-
all_build_deps = build.get_build_reqs(self, recursive=True)
465+
dep_names = [
466+
dep.name
467+
for dep in self.requires
468+
if dep.is_activated() and build.env.is_valid_for_marker(dep.marker)
469+
]
470+
471+
deps = build.get_packages(dep_names, recursive=True)
466472
ld_env_args = build.get_ld_env(
467-
deps=all_build_deps,
473+
deps=deps,
468474
wd="${_wd}",
469475
extra=["${_ldlibpath}"],
470476
)

0 commit comments

Comments
 (0)