Rustup to rustc 1.54.0-nightly (3e99439f4 2021-05-17)

[rust.git] / build.sh

diff --git a/build.sh b/build.sh
index 4917dff7ce6e1e32b5aee66cde79728f0c29999f..76bc1884334afe4ea539ca65be6b5f8c32f5203d 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -1,76 +1,89 @@
-#!/bin/bash
-
+#!/usr/bin/env bash
 set -e
 
-unamestr=`uname`
-if [[ "$unamestr" == 'Linux' ]]; then
-   dylib_ext='so'
+# Settings
+export CHANNEL="release"
+build_sysroot="clif"
+target_dir='build'
+while [[ $# != 0 ]]; do
+    case $1 in
+        "--debug")
+            export CHANNEL="debug"
+            ;;
+        "--sysroot")
+            build_sysroot=$2
+            shift
+            ;;
+        "--target-dir")
+            target_dir=$2
+            shift
+            ;;
+        *)
+            echo "Unknown flag '$1'"
+            echo "Usage: ./build.sh [--debug] [--sysroot none|clif|llvm] [--target-dir DIR]"
+            exit 1
+            ;;
+    esac
+    shift
+done
+
+# Build cg_clif
+unset CARGO_TARGET_DIR
+unamestr=$(uname)
+if [[ "$unamestr" == 'Linux' || "$unamestr" == "FreeBSD" ]]; then
+   export RUSTFLAGS='-Clink-arg=-Wl,-rpath=$ORIGIN/../lib '$RUSTFLAGS
 elif [[ "$unamestr" == 'Darwin' ]]; then
+   export RUSTFLAGS='-Csplit-debuginfo=unpacked -Clink-arg=-Wl,-rpath,@loader_path/../lib -Zosx-rpath-install-name '$RUSTFLAGS
    dylib_ext='dylib'
 else
-   echo "Unsupported os"
+   echo "Unsupported os $unamestr"
    exit 1
 fi
-
-build_example_bin() {
-    $RUSTC $2 --crate-name $1 --crate-type bin
-    sh -c ./target/out/$1 || true
-}
-
-if [[ "$1" == "--release" ]]; then
-    channel='release'
+if [[ "$CHANNEL" == "release" ]]; then
     cargo build --release
 else
-    channel='debug'
     cargo build
 fi
 
-export RUSTFLAGS='-Zalways-encode-mir -Cpanic=abort -Zcodegen-backend='$(pwd)'/target/'$channel'/librustc_codegen_cranelift.'$dylib_ext
-export XARGO_RUST_SRC=$(pwd)'/target/libcore/src'
-RUSTC="rustc $RUSTFLAGS -L crate=target/out --out-dir target/out"
-
-rm -r target/out || true
-mkdir -p target/out/clif
-
-echo "[BUILD] mini_core"
-$RUSTC example/mini_core.rs --crate-name mini_core --crate-type lib
-
-echo "[BUILD] example"
-$RUSTC example/example.rs --crate-type lib
-
-echo "[JIT] mini_core_hello_world"
-SHOULD_RUN=1 $RUSTC --crate-type bin example/mini_core_hello_world.rs --cfg jit
+source scripts/ext_config.sh
 
-echo "[AOT] mini_core_hello_world"
-build_example_bin mini_core_hello_world example/mini_core_hello_world.rs
+rm -rf "$target_dir"
+mkdir "$target_dir"
+mkdir "$target_dir"/bin "$target_dir"/lib
+ln target/$CHANNEL/cg_clif{,_build_sysroot} "$target_dir"/bin
+ln target/$CHANNEL/*rustc_codegen_cranelift* "$target_dir"/lib
+ln rust-toolchain scripts/config.sh scripts/cargo.sh "$target_dir"
 
-pushd xargo
-rm -r ~/.xargo/HOST || true
-rm -r target || true
-time xargo build
-popd
-
-# TODO linux linker doesn't accept duplicate definitions
-#$RUSTC --sysroot ~/.xargo/HOST example/alloc_example.rs --crate-type bin
-#./target/out/alloc_example
-
-$RUSTC --sysroot ~/.xargo/HOST example/mod_bench.rs --crate-type bin
-
-echo "[BUILD] RUSTFLAGS=-Zmir-opt-level=3"
-pushd xargo
-rm -r ~/.xargo/HOST || true
-rm -r target || true
-time RUSTFLAGS="-Zmir-opt-level=3 $RUSTFLAGS" xargo build
-popd
-
-$RUSTC --sysroot ~/.xargo/HOST example/mod_bench.rs --crate-type bin -Zmir-opt-level=3 --crate-name mod_bench_inline
-
-rustc example/mod_bench.rs --crate-type bin -Copt-level=0 -o target/out/mod_bench_llvm_0 -Cpanic=abort
-rustc example/mod_bench.rs --crate-type bin -Copt-level=1 -o target/out/mod_bench_llvm_1 -Cpanic=abort
-rustc example/mod_bench.rs --crate-type bin -Copt-level=2 -o target/out/mod_bench_llvm_2 -Cpanic=abort
-rustc example/mod_bench.rs --crate-type bin -Copt-level=3 -o target/out/mod_bench_llvm_3 -Cpanic=abort
-echo
-echo "[Bench] mod_bench"
-hyperfine ./target/out/mod_bench{,_inline} ./target/out/mod_bench_llvm_*
+mkdir -p "$target_dir/lib/rustlib/$TARGET_TRIPLE/lib/"
+mkdir -p "$target_dir/lib/rustlib/$HOST_TRIPLE/lib/"
+if [[ "$TARGET_TRIPLE" == "x86_64-pc-windows-gnu" ]]; then
+    cp $(rustc --print sysroot)/lib/rustlib/$TARGET_TRIPLE/lib/*.o "$target_dir/lib/rustlib/$TARGET_TRIPLE/lib/"
+fi
 
-cat target/out/log.txt | sort | uniq -c
+case "$build_sysroot" in
+    "none")
+        ;;
+    "llvm")
+        cp -r $(rustc --print sysroot)/lib/rustlib/$TARGET_TRIPLE/lib "$target_dir/lib/rustlib/$TARGET_TRIPLE/"
+        if [[ "$HOST_TRIPLE" != "$TARGET_TRIPLE" ]]; then
+            cp -r $(rustc --print sysroot)/lib/rustlib/$HOST_TRIPLE/lib "$target_dir/lib/rustlib/$HOST_TRIPLE/"
+        fi
+        ;;
+    "clif")
+        echo "[BUILD] sysroot"
+        dir=$(pwd)
+        cd "$target_dir"
+        time "$dir/build_sysroot/build_sysroot.sh"
+        if [[ "$HOST_TRIPLE" != "$TARGET_TRIPLE" ]]; then
+            time TARGET_TRIPLE="$HOST_TRIPLE" "$dir/build_sysroot/build_sysroot.sh"
+        fi
+        cp lib/rustlib/*/lib/libstd-* lib/
+        ;;
+    *)
+        echo "Unknown sysroot kind \`$build_sysroot\`."
+        echo "The allowed values are:"
+        echo "    none A sysroot that doesn't contain the standard library"
+        echo "    llvm Copy the sysroot from rustc compiled by cg_llvm"
+        echo "    clif Build a new sysroot using cg_clif"
+        exit 1
+esac