mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-19 05:07:11 -05:00
5378edeab4
The procedure ‘which’ from (guix build utils)
is used for two different purposes:
1. for finding the absolute file name of a binary
that needs to run during the build process
2. for finding the absolute file name of a binary,
for the target system (as in --target=TARGET),
e.g. for substituting sh->/gnu/store/.../bin/sh,
python->/gnu/store/.../bin/python.
When compiling natively (target=#f in Guix parlance),
this is perfectly fine.
However, when cross-compiling, there is a problem.
"which" looks in $PATH for binaries. That's good for purpose (1),
but incorrect for (2), as the $PATH contains binaries from native-inputs
instead of inputs.
This commit defines a ‘search-input-file’ procedure. It functions
like 'which', but instead of searching in $PATH, it searches in
the 'inputs' of the build phase, which must be passed to
‘search-input-file’ as an argument. Also, the file name must
include "bin/" or "sbin/" as appropriate.
* guix/build/utils.scm (search-input-file): New procedure.
* tests/build-utils.scm
("search-input-file: exception if not found")
("search-input-file: can find if existent"): Test it.
* doc/guix.texi (File Search): Document it.
Partially-Fixes: <https://issues.guix.gnu.org/47869>
Co-Authored-By: Ludovic Courtès <ludo@gnu.org>
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
|
||
|---|---|---|
| .. | ||
| services | ||
| accounts.scm | ||
| base16.scm | ||
| base32.scm | ||
| base64.scm | ||
| boot-parameters.scm | ||
| bournish.scm | ||
| build-utils.scm | ||
| builders.scm | ||
| cache.scm | ||
| challenge.scm | ||
| channels.scm | ||
| civodul.key | ||
| combinators.scm | ||
| containers.scm | ||
| cpan.scm | ||
| cpio.scm | ||
| cran.scm | ||
| crate.scm | ||
| cve-sample.json | ||
| cve.scm | ||
| debug-link.scm | ||
| derivations.scm | ||
| discovery.scm | ||
| dsa.key | ||
| ed25519.key | ||
| ed25519.sec | ||
| ed25519bis.key | ||
| ed25519bis.sec | ||
| elpa.scm | ||
| file-systems.scm | ||
| gem.scm | ||
| gexp.scm | ||
| git-authenticate.scm | ||
| git.scm | ||
| glob.scm | ||
| gnu-maintenance.scm | ||
| go.scm | ||
| grafts.scm | ||
| graph.scm | ||
| gremlin.scm | ||
| guix-archive.sh | ||
| guix-authenticate.sh | ||
| guix-build-branch.sh | ||
| guix-build.sh | ||
| guix-daemon.sh | ||
| guix-describe.sh | ||
| guix-download.sh | ||
| guix-environment-container.sh | ||
| guix-environment.sh | ||
| guix-gc.sh | ||
| guix-git-authenticate.sh | ||
| guix-graph.sh | ||
| guix-hash.sh | ||
| guix-lint.sh | ||
| guix-pack-localstatedir.sh | ||
| guix-pack-relocatable.sh | ||
| guix-pack.sh | ||
| guix-package-aliases.sh | ||
| guix-package-net.sh | ||
| guix-package.sh | ||
| guix-repl.sh | ||
| guix-system.sh | ||
| hackage.scm | ||
| import-utils.scm | ||
| inferior.scm | ||
| ipfs.scm | ||
| lint.scm | ||
| modules.scm | ||
| monads.scm | ||
| nar.scm | ||
| networking.scm | ||
| offload.scm | ||
| opam.scm | ||
| openpgp.scm | ||
| pack.scm | ||
| packages.scm | ||
| pki.scm | ||
| print.scm | ||
| processes.scm | ||
| profiles.scm | ||
| publish.scm | ||
| pypi.scm | ||
| records.scm | ||
| rsa.key | ||
| scripts.scm | ||
| search-paths.scm | ||
| services.scm | ||
| sets.scm | ||
| signing-key.pub | ||
| signing-key.sec | ||
| size.scm | ||
| status.scm | ||
| store-database.scm | ||
| store-deduplication.scm | ||
| store-roots.scm | ||
| store.scm | ||
| substitute.scm | ||
| swh.scm | ||
| syscalls.scm | ||
| system.scm | ||
| test.drv | ||
| texlive.scm | ||
| transformations.scm | ||
| ui.scm | ||
| union.scm | ||
| upstream.scm | ||
| utils.scm | ||
| uuid.scm | ||
| workers.scm | ||