summaryrefslogtreecommitdiffstats
path: root/development/rust/rust.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'development/rust/rust.SlackBuild')
-rw-r--r--development/rust/rust.SlackBuild18
1 files changed, 13 insertions, 5 deletions
diff --git a/development/rust/rust.SlackBuild b/development/rust/rust.SlackBuild
index c007f91c22..0dd10d6ac4 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