diff options
Diffstat (limited to 'source/d/rust')
| -rwxr-xr-x | source/d/rust/rust.SlackBuild | 18 | ||||
| -rw-r--r-- | source/d/rust/rust.url | 14 |
2 files changed, 16 insertions, 16 deletions
diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 8a52b31ac..48eb71ece 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -26,17 +26,17 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.34.2} +VERSION=${VERSION:-1.35.0} BUILD=${BUILD:-1} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. # YES is probably better (when it works...) -SYSTEM_LLVM=${SYSTEM_LLVM:-NO} +SYSTEM_LLVM=${SYSTEM_LLVM:-YES} # Bootstrap variables (might not be kept updated for latest Rust): -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.33.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2019-02-28} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.34.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.34.2} +RSTAGE0_DIR=${RSTAGE0_DIR:-2019-05-14} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.35.0} CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} # Automatically determine the architecture we're building on: @@ -154,9 +154,9 @@ if [ "$LOCAL_BOOTSTRAP" != "yes" ] ; then mkdir -p build/cache/$RSTAGE0_DIR cp $CWD/$PKGNAM-std-$RSTAGE0_VERSION-$BARCH-unknown-linux-gnu.tar.?z \ $CWD/$SRCNAM-$RSTAGE0_VERSION-$BARCH-unknown-linux-gnu.tar.?z \ - build/cache/$RSTAGE0_DIR || exit 1 + build/cache/$RSTAGE0_DIR mkdir -p build/cache/$CSTAGE0_DIR - cp $CWD/cargo-$CSTAGE0_VERSION-$BARCH-unknown-linux-gnu.tar.?z build/cache/$CSTAGE0_DIR || exit 1 + cp $CWD/cargo-$CSTAGE0_VERSION-$BARCH-unknown-linux-gnu.tar.?z build/cache/$CSTAGE0_DIR fi # Build configuration. We'll go ahead and build with rpath because it may be @@ -241,8 +241,8 @@ if [ "$ARCH" = "armv7hl" ] ; then else # README.md says gcc 4.7 / clang 3.x or later needed # but building fails for me with GCC 5.3 from slackware 14.2 - CC=clang \ - CXX=clang++ \ + export CC=clang + export CXX=clang++ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ python x.py dist || exit 1 diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url index ab9c83b98..93bbc2e31 100644 --- a/source/d/rust/rust.url +++ b/source/d/rust/rust.url @@ -1,5 +1,5 @@ # Source code (repacked to .tar.xz): -lftpget https://static.rust-lang.org/dist/rustc-1.34.2-src.tar.gz +lftpget https://static.rust-lang.org/dist/rustc-1.35.0-src.tar.gz gzip -d rustc-*tar.gz plzip -9 -v rustc-*tar @@ -12,12 +12,12 @@ plzip -9 -v rustc-*tar exit 0 # i686 bootstrap: -lftpget https://static.rust-lang.org/dist/2019-02-28/cargo-0.34.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-02-28/rust-std-1.33.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-02-28/rustc-1.33.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-05-14/cargo-0.35.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-05-14/rust-std-1.34.2-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-05-14/rustc-1.34.2-i686-unknown-linux-gnu.tar.gz # x86_64 bootstrap: -lftpget https://static.rust-lang.org/dist/2019-02-28/cargo-0.34.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-02-28/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-02-28/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-05-14/cargo-0.35.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-05-14/rust-std-1.34.2-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-05-14/rustc-1.34.2-x86_64-unknown-linux-gnu.tar.gz |