From 911c3deb4080306ea909081bc00c3485fd6caed2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Nov 2023 16:58:14 +0200 Subject: [PATCH] guix: platform: Add platform-rust-target. * guix/platform.scm : Add rust-target field. * guix/platforms/arm.scm (armv7-linux, aarch64-linux): Add the system's rust target triplet. * guix/platforms/mips.scm (mips64-linux): * guix/platforms/powerpc.scm (powerpc-linux, powerpc64-linux, powerpc64le-linux): * guix/platforms/riscv.scm (riscv64-linux): * guix/platforms/x86.scm (i686-linux, x86_64-linux, i686-mingw, x86_64-mingw, i586-pc): Same. Change-Id: Id9dca0fb8ec2b3bf2b3876b974e4bbaa30dbc6a6 --- guix/platform.scm | 3 +++ guix/platforms/arm.scm | 2 ++ guix/platforms/mips.scm | 1 + guix/platforms/powerpc.scm | 3 +++ guix/platforms/riscv.scm | 1 + guix/platforms/x86.scm | 5 +++++ 6 files changed, 15 insertions(+) diff --git a/guix/platform.scm b/guix/platform.scm index 55917ca308..994563ab26 100644 --- a/guix/platform.scm +++ b/guix/platform.scm @@ -29,6 +29,7 @@ platform-target platform-system platform-linux-architecture + platform-rust-target platform-glibc-dynamic-linker &platform-not-found-error @@ -74,6 +75,8 @@ (system platform-system) (linux-architecture platform-linux-architecture (default #false)) + (rust-target platform-rust-target + (default #false)) (glibc-dynamic-linker platform-glibc-dynamic-linker)) diff --git a/guix/platforms/arm.scm b/guix/platforms/arm.scm index 32c0fbc032..b0c76efc73 100644 --- a/guix/platforms/arm.scm +++ b/guix/platforms/arm.scm @@ -27,6 +27,7 @@ (target "arm-linux-gnueabihf") (system "armhf-linux") (linux-architecture "arm") + (rust-target "armv7-unknown-linux-gnueabihf") (glibc-dynamic-linker "/lib/ld-linux-armhf.so.3"))) (define aarch64-linux @@ -34,4 +35,5 @@ (target "aarch64-linux-gnu") (system "aarch64-linux") (linux-architecture "arm64") + (rust-target "aarch64-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld-linux-aarch64.so.1"))) diff --git a/guix/platforms/mips.scm b/guix/platforms/mips.scm index e6fa9eb292..17b6958f48 100644 --- a/guix/platforms/mips.scm +++ b/guix/platforms/mips.scm @@ -26,4 +26,5 @@ (target "mips64el-linux-gnu") (system "mips64el-linux") (linux-architecture "mips") + (rust-target "mips64el-unknown-linux-gnuabi64") (glibc-dynamic-linker "/lib/ld.so.1"))) diff --git a/guix/platforms/powerpc.scm b/guix/platforms/powerpc.scm index 1c7141ab42..c55301768d 100644 --- a/guix/platforms/powerpc.scm +++ b/guix/platforms/powerpc.scm @@ -28,6 +28,7 @@ (target "powerpc-linux-gnu") (system "powerpc-linux") (linux-architecture "powerpc") + (rust-target "powerpc-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld.so.1"))) (define powerpc64-linux @@ -35,6 +36,7 @@ (target "powerpc64-linux-gnu") (system #f) ;not supported (linux-architecture "powerpc") + (rust-target "powerpc64-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld64.so.1"))) (define powerpc64le-linux @@ -42,4 +44,5 @@ (target "powerpc64le-linux-gnu") (system "powerpc64le-linux") (linux-architecture "powerpc") + (rust-target "powerpc64le-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld64.so.2"))) diff --git a/guix/platforms/riscv.scm b/guix/platforms/riscv.scm index c716c12c12..1b34e82b36 100644 --- a/guix/platforms/riscv.scm +++ b/guix/platforms/riscv.scm @@ -26,4 +26,5 @@ (target "riscv64-linux-gnu") (system "riscv64-linux") (linux-architecture "riscv") + (rust-target "riscv64gc-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld-linux-riscv64-lp64d.so.1"))) diff --git a/guix/platforms/x86.scm b/guix/platforms/x86.scm index 6f547dd770..4ed5638c14 100644 --- a/guix/platforms/x86.scm +++ b/guix/platforms/x86.scm @@ -30,6 +30,7 @@ (target "i686-linux-gnu") (system "i686-linux") (linux-architecture "i386") + (rust-target "i686-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld-linux.so.2"))) (define x86_64-linux @@ -37,22 +38,26 @@ (target "x86_64-linux-gnu") (system "x86_64-linux") (linux-architecture "x86_64") + (rust-target "x86_64-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld-linux-x86-64.so.2"))) (define i686-mingw (platform (target "i686-w64-mingw32") (system #f) + (rust-target "i686-pc-windows-gnu") (glibc-dynamic-linker #f))) (define x86_64-mingw (platform (target "x86_64-w64-mingw32") (system #f) + (rust-target "x86_64-pc-windows-gnu") (glibc-dynamic-linker #f))) (define i586-gnu (platform (target "i586-pc-gnu") (system "i586-gnu") + (rust-target "i686-unknown-hurd-gnu") (glibc-dynamic-linker "/lib/ld.so.1")))