diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-11-22 18:56:56 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-11-22 19:44:53 +0200 |
| commit | 73dbcc4b5fc14149e56d315b9bc855adc3d5cd19 (patch) | |
| tree | 0c9e21fd8615261cd5104ae712fd55b41cea83ec /guix | |
| parent | 3dbf3a7f516cb5576ce77d9545cfa56b741f279b (diff) | |
| download | guix-patches-73dbcc4b5fc14149e56d315b9bc855adc3d5cd19.tar guix-patches-73dbcc4b5fc14149e56d315b9bc855adc3d5cd19.tar.gz | |
build-system/cargo: Set libclang environment variable when available.
* guix/build/cargo-build-system.scm (configure): When clang is available
in the build environment set the LIBCLANG_PATH variable.
* gnu/packages/crates-graphics.scm (rust-aom-sys-0.1,
uust-dav1d-sys-0.3),
* gnu/packages/crates-io.scm (rust-bindgen-0.55, rust-bindgen-0.54,
rust-bindgen-0.53, rust-bindgen-0.52, rust-cexpr-0.4, rust-cexpr-0.3,
rust-cexpr-0.2, rust-clang-sys-1, rust-clang-sys-0.29,
rust-clang-sys-0.26, rust-clang-sys-0.22, rust-clang-sys-0.11,
rust-libpijul-0.12, rust-nettle-7, rust-nettle-sys-2,
rust-sequoia-openpgp-0.9)[arguments]: Remove phases which set an
environment variable to find clang.
[inputs]: Rename instances of libclang with clang.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build/cargo-build-system.scm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 22c5d3b530..8c0268906e 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -124,6 +124,9 @@ directory = '" port) (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") (when (assoc-ref inputs "openssl") (setenv "OPENSSL_DIR" (assoc-ref inputs "openssl"))) + (when (assoc-ref inputs "clang") + (setenv "LIBCLANG_PATH" + (string-append (assoc-ref inputs "clang") "/lib"))) ;; We don't use the Cargo.lock file to determine the package versions we use ;; during building, and in any case if one is not present it is created |