diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-11-28 12:58:36 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-11-28 12:58:36 +0200 |
| commit | 55faf486c7b0d4d3e924b0923e8065cd4386af93 (patch) | |
| tree | 32c1f2a6b84021d75620ed97bb10715db5e85818 | |
| parent | 6619021d32ca8c9c062d3935312f73fb7098cd12 (diff) | |
build: cargo: Use correct config file for cargo config.
* guix/build/cargo-build-system.scm (configure): Use .cargo/config as
the config file. Add a note.
Change-Id: Ice006c11184d4c8e1bdb765c3998b06ad299e55b
| -rw-r--r-- | guix/build/cargo-build-system.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 2e6aeb78be..ffb2ec898e 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -181,7 +181,8 @@ libraries or executables." ;; Configure cargo to actually use this new directory with all the crates. (setenv "CARGO_HOME" (string-append (getcwd) "/.cargo")) (mkdir-p ".cargo") - (let ((port (open-file ".cargo/config.toml" "w" #:encoding "utf-8"))) + ;; Not .cargo/config.toml, rustc/cargo will generate .cargo/config otherwise. + (let ((port (open-file ".cargo/config" "w" #:encoding "utf-8"))) ;; Placed here so it doesn't cause random rebuilds. Neither of these work. ;; sysroot = '" (assoc-ref inputs "rust-sysroot") "' ;; rustflags = ['--sysroot', '" (assoc-ref inputs "rust-sysroot") "'] |