diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2023-11-20 12:21:03 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2023-11-28 07:59:43 +0200 |
commit | 584bd0bb3d88a69933b3d4e4974564a91adc6816 (patch) | |
tree | 6f2fad1b93a96bb41cec454a6ae7fcde74f69663 /gnu/packages/rust.scm | |
parent | 3dc6253e878fa6a4cb7670c62249ed05ebb85e40 (diff) |
gnu: Add make-rust-sysroot.
* gnu/packages/rust.scm (make-rust-sysroot): New procedure.
Change-Id: I5ce4b7a3aab0a9e8d254159e2fbc6cf6b3442c32
Diffstat (limited to 'gnu/packages/rust.scm')
-rw-r--r-- | gnu/packages/rust.scm | 174 |
1 files changed, 174 insertions, 0 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e11148e89e..6b025a90fc 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -40,14 +40,17 @@ #:use-module (gnu packages bootstrap) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages cross-base) #:use-module (gnu packages curl) #:use-module (gnu packages elf) #:use-module (gnu packages flex) #:use-module (gnu packages gcc) #:use-module (gnu packages gdb) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages mingw) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages ssh) @@ -64,6 +67,7 @@ #:use-module (guix utils) #:use-module (guix gexp) #:use-module (ice-9 match) + #:use-module (ice-9 optargs) #:use-module (srfi srfi-26)) ;; This is the hash for the empty file, and the reason it's relevant is not @@ -1048,6 +1052,176 @@ exec -a \"$0\" \"~a\" \"$@\"" `("procps" ,procps) (package-native-inputs base-rust)))))) +(define*-public (make-rust-sysroot target) + (let ((base-rust rust)) + (package + (inherit base-rust) + (name (string-append "rust-sysroot-for-" target)) + (outputs '("out")) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:tests? _ #f) #f) ; This package for cross-building. + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'unbundle-xz + (lambda _ + (delete-file-recursively "vendor/lzma-sys/xz-5.2") + ;; Remove the option of using the static library. + ;; This is necessary for building the sysroot. + (substitute* "vendor/lzma-sys/build.rs" + (("!want_static && ") "")))) + ,@(if (target-mingw? target) + `((add-after 'set-env 'patch-for-mingw + (lambda* (#:key inputs #:allow-other-keys) + (setenv "LIBRARY_PATH" + (string-join + (delete + (string-append + (or (assoc-ref inputs "mingw-w64-i686-winpthreads") + (assoc-ref inputs "mingw-w64-x86_64-winpthreads")) + "/lib") + (string-split (getenv "LIBRARY_PATH") #\:)) + ":")) + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (delete + (string-append + (or (assoc-ref inputs "mingw-w64-i686-winpthreads") + (assoc-ref inputs "mingw-w64-x86_64-winpthreads")) + "/include") + (string-split (getenv "CPLUS_INCLUDE_PATH") #\:)) + ":")) + ;; When building a rust-sysroot this crate is only used for + ;; the rust-installer. + (substitute* "vendor/num_cpus/src/linux.rs" + (("\\.ceil\\(\\)") "")) + ;; gcc doesn't recognize this flag. + (substitute* + "compiler/rustc_target/src/spec/windows_gnullvm_base.rs" + ((", \"--unwindlib=none\"") ""))))) + `()) + (replace 'set-env + (lambda* (#:key inputs #:allow-other-keys) + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) + (setenv "CC" (which "gcc")) + ;; The Guix LLVM package installs only shared libraries. + (setenv "LLVM_LINK_SHARED" "1") + + (setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH")) + (setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH")) + (when (assoc-ref inputs (string-append "glibc-cross-" ,target)) + (setenv "LIBRARY_PATH" + (string-join + (delete + (string-append + (assoc-ref inputs + (string-append "glibc-cross-" ,target)) + "/lib") + (string-split (getenv "LIBRARY_PATH") #\:)) + ":")) + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (delete + (string-append + (assoc-ref inputs + (string-append "glibc-cross-" ,target)) + "/include") + (string-split (getenv "CPLUS_INCLUDE_PATH") #\:)) + ":"))))) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (target-cc + (search-input-file + inputs (string-append "/bin/" ,(cc-for-target target))))) + (call-with-output-file "config.toml" + (lambda (port) + (display (string-append " +[llvm] +[build] +cargo = \"" (search-input-file inputs "/bin/cargo") "\" +rustc = \"" (search-input-file inputs "/bin/rustc") "\" +docs = false +python = \"" (which "python") "\" +vendor = true +submodules = false +target = [\"" ,(nix-system->gnu-triplet-for-rust (gnu-triplet->nix-system target)) "\"] +[install] +prefix = \"" out "\" +sysconfdir = \"etc\" +[rust] +debug = false +jemalloc = false +default-linker = \"" target-cc "\" +channel = \"stable\" +[target." ,(nix-system->gnu-triplet-for-rust) "] +# These are all native tools +llvm-config = \"" (search-input-file inputs "/bin/llvm-config") "\" +linker = \"" (which "gcc") "\" +cc = \"" (which "gcc") "\" +cxx = \"" (which "g++") "\" +ar = \"" (which "ar") "\" +[target." ,(nix-system->gnu-triplet-for-rust (gnu-triplet->nix-system target)) "] +llvm-config = \"" (search-input-file inputs "/bin/llvm-config") "\" +linker = \"" target-cc "\" +cc = \"" target-cc "\" +cxx = \"" (search-input-file inputs (string-append "/bin/" ,(cxx-for-target target))) "\" +ar = \"" (search-input-file inputs (string-append "/bin/" ,(ar-for-target target))) "\" +[dist] +") port)))))) + (replace 'build + ;; Phase overridden to build the necessary directories. + (lambda* (#:key parallel-build? #:allow-other-keys) + (let ((job-spec (string-append + "-j" (if parallel-build? + (number->string (parallel-job-count)) + "1")))) + ;; This works for us with the --sysroot flag + ;; and then we can build ONLY library/std + (invoke "./x.py" job-spec "build" "library/std")))) + (replace 'install + (lambda _ + (invoke "./x.py" "install" "library/std"))) + (add-after 'install 'remove-uninstall-script + (lambda* (#:key outputs #:allow-other-keys) + ;; This script has no use on Guix + ;; and it retains a reference to the host's bash. + (delete-file (string-append (assoc-ref outputs "out") + "/lib/rustlib/uninstall.sh")))) + (delete 'install-rust-src) + (delete 'wrap-rust-analyzer) + (delete 'wrap-rustc))))) + (inputs + (modify-inputs (package-inputs base-rust) + (prepend xz))) ; for lzma-sys + (propagated-inputs + (if (target-mingw? target) + (modify-inputs (package-propagated-inputs base-rust) + (prepend + (if (string=? "i686-w64-mingw32" target) + mingw-w64-i686-winpthreads + mingw-w64-x86_64-winpthreads))) + (package-propagated-inputs base-rust))) + (native-inputs + (if (target-mingw? target) + (modify-inputs (package-native-inputs base-rust) + (prepend (cross-gcc target + #:libc (cross-libc target)) + (cross-binutils target) + (if (string=? "i686-w64-mingw32" target) + mingw-w64-i686-winpthreads + mingw-w64-x86_64-winpthreads) + libunwind)) + (modify-inputs (package-native-inputs base-rust) + (prepend (cross-gcc target + #:libc (cross-libc target)) + (cross-libc target) + (cross-binutils target))))) + (properties + `((hidden? . #t) + ,(package-properties base-rust)))))) + (define-public rust-analyzer (package (name "rust-analyzer") |