diff options
| author | Andrew Clemons <andrew.clemons@gmail.com> | 2018-03-30 13:38:44 +1300 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-03-31 07:41:43 +0700 |
| commit | 7a6bb7853a2636274ca77853eff1eee69c9bbc68 (patch) | |
| tree | 424925774cd1f00935ba20af7171ed55a09fb8e7 /development/rust/rust.SlackBuild | |
| parent | 816a6642a6fcc0c3465796649f3a7a0e7f973c93 (diff) | |
development/rust: Updated for version 1.25.0.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Diffstat (limited to 'development/rust/rust.SlackBuild')
| -rw-r--r-- | development/rust/rust.SlackBuild | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/development/rust/rust.SlackBuild b/development/rust/rust.SlackBuild index c007f91c222e1..0dd10d6ac4825 100644 --- a/development/rust/rust.SlackBuild +++ b/development/rust/rust.SlackBuild @@ -26,12 +26,12 @@ PRGNAM=rust SRCNAM="${PRGNAM}c" -VERSION=${VERSION:-1.24.1} +VERSION=${VERSION:-1.25.0} # src/stage0.txt -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.23.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2018-01-04} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.24.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.24.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2018-02-15} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.25.0} CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} BUILD=${BUILD:-1} @@ -156,6 +156,9 @@ fi SYSTEM_LLVM=${SYSTEM_LLVM:-no} cat << EOF > config.toml +[llvm] +targets = "X86" + [build] build = "$BARCH-unknown-linux-$BABI" host = ["$TARCH-unknown-linux-$BABI"] @@ -173,12 +176,17 @@ mandir = "man" [rust] codegen-units = 0 +thinlto = false channel = "stable" rpath = true codegen-tests = false ignore-git = true EOF +if [ "$ARCH" = "arm" ] ; then + sed -i 's/"X86"/"X86;ARM"//' config.toml +fi + if [ "$SYSTEM_LLVM" = "yes" ] ; then cat << EOF >> config.toml @@ -195,7 +203,7 @@ llvm-config = "/usr/bin/llvm-config" llvm-config = "/usr/bin/llvm-config" EOF - if [ "$(llvm-config --version)" = "5.0.1" ] ; then + if [ "$(llvm-config --version | cut -d. -f1)" -gt 3 ] ; then # llvm-config --cflags returns a set of flags including -Wcovered-switch-default # and -Wstring-conversion which gcc does not support, breaking the build. cat << EOF > local-llvm-config |