diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2024-08-31 14:18:39 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-09-08 19:21:29 +0100 |
| commit | 08cb1492fe62e8f15aa0d546db59ba27ec7a5ab3 (patch) | |
| tree | a8ac7386cd8f1227601c70a987095d4feeb48a5a /eclass | |
| parent | distutils-r1.eclass: Allow .jar files in sitedir (diff) | |
| download | gentoo-08cb1492fe62e8f15aa0d546db59ba27ec7a5ab3.tar.gz gentoo-08cb1492fe62e8f15aa0d546db59ba27ec7a5ab3.tar.bz2 gentoo-08cb1492fe62e8f15aa0d546db59ba27ec7a5ab3.zip | |
distutils-r1.eclass: Don't run cargo_env unless cargo_gen_config has run
Normally, failing to run cargo_gen_config results in an error, but that
is unhelpful for ebuilds with optional Cargo support.
Closes: https://bugs.gentoo.org/938764
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/38041
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/distutils-r1.eclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 39705c5c3c84..5a6ebdcede8a 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1253,7 +1253,9 @@ distutils_pep517_install() { fi local cmd=() config_settings= - has cargo ${INHERITED} && cmd+=( cargo_env ) + if has cargo ${INHERITED} && [[ ${_CARGO_GEN_CONFIG_HAS_RUN} ]]; then + cmd+=( cargo_env ) + fi case ${DISTUTILS_USE_PEP517} in maturin) |