From 210b4b343f2bd2d19b0be0ce3cb3a7f217ba6396 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 26 Jun 2015 07:43:19 +0200 Subject: [PATCH] rust: try to fix target triples (v2). --- srcpkgs/rust/template | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index aa7f4cd6fa3..8130a3cea1e 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -15,10 +15,13 @@ distfiles="https://static.rust-lang.org/dist/rustc-${version/.beta/-beta}-src.ta checksum=cb09f443b37ec1b81fe73c04eb413f9f656859cf7d00bc5088008cbc2a63fa8a do_configure() { - ln -sf x86_64-unknown-linux-gnu.mk mk/cfg/x86_64-linux-gnu.mk - ln -sf i686-unknown-linux-gnu.mk mk/cfg/i686-pc-linux-gnu.mk - ln -sf x86_64-unknown-linux-musl.mk mk/cfg/x86_64-linux-musl.mk - ./configure --musl-root=/usr --prefix=/usr --disable-docs --enable-ccache --build=$XBPS_TRIPLET + local _triplet + case $XBPS_TARGET_MACHINE in + i686*) _triplet=i686-unknown-linux-gnu;; + x86_64*) _triplet=x86_64-unknown-linux-gnu;; + *) _triplet=$XBPS_TARGET_MACHINE;; + esac + ./configure --musl-root=/usr --prefix=/usr --disable-docs --enable-ccache --build=${_triplet} } post_install() { vlicense COPYRIGHT