diff options
Diffstat (limited to 'development/rust/rust.SlackBuild')
| -rw-r--r-- | development/rust/rust.SlackBuild | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/development/rust/rust.SlackBuild b/development/rust/rust.SlackBuild index f7c8ad00ee..98b0387c46 100644 --- a/development/rust/rust.SlackBuild +++ b/development/rust/rust.SlackBuild @@ -26,20 +26,20 @@ PRGNAM=rust SRCNAM="${PRGNAM}c" -VERSION=${VERSION:-1.26.2} +VERSION=${VERSION:-1.27.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. # YES is probably better (when it works...) -# LLVM in Slackware14.2 is now too old to build rust 1.26.0 +# LLVM in Slackware14.2 is now too old to build rust 1.27.2 SYSTEM_LLVM=${SYSTEM_LLVM:-NO} SYSTEM_LLVM=$(echo "$SYSTEM_LLVM" | tr '[:lower:]' '[:upper:]') # Bootstrap variables (might not be kept updated for latest Rust): -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.25.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2018-03-29} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.26.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.26.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2018-05-10} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.27.0} CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} if [ -z "$ARCH" ]; then @@ -192,6 +192,13 @@ if [ "$ARCH" = "arm" ] ; then sed -i 's/"X86"/"X86;ARM"//' config.toml fi +if case "$ARCH" in i?86) true ;; *) false ;; esac && [ "$(echo "$VERSION" | cut -d. -f 1)" -eq 1 ] && [ "$(echo "$VERSION" | cut -d. -f 2)" -ge 27 ] ; then + # building rust on 32bit is now failing with (signal: 11, SIGSEGV: invalid memory reference) + # or sometimes LLVM ERROR: out of memory. + # maybe using fewer codegen-units seems to help + sed -i 's/codegen-units = 0/codegen-units = 1/' config.toml +fi + if [ "${SYSTEM_LLVM}" = "YES" ]; then cat << EOF >> config.toml # Add this stuff to build with the system LLVM: |