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

[rust.git] / build.sh

diff --git a/build.sh b/build.sh
index 86cefa83971b10ae0c1510efb83bdfecc9150f08..76bc1884334afe4ea539ca65be6b5f8c32f5203d 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -1,72 +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
-
-extract_data() {
-    pushd target/out/
-    ar x $1 data.o
-    chmod +rw data.o
-    mv data.o $2
-    popd
-}
-
-link_and_run() {
-    target=$1
-    shift
-    pushd target/out
-    gcc $@ -o $target
-    sh -c ./$target || true
-    popd
-}
-
-build_lib() {
-    SHOULD_CODEGEN=1 $RUSTC $2 --crate-name $1 --crate-type lib
-    extract_data lib$1.rlib $1.o
-}
-
-run_bin() {
-    SHOULD_RUN=1 $RUSTC $1 --crate-type bin
-}
-
-build_example_bin() {
-    $RUSTC $2 --crate-name $1 --crate-type bin
-    extract_data $1 $1.o
-
-    link_and_run $1 mini_core.o $1.o
-}
-
-if [[ "$1" == "--release" ]]; then
-    channel='release'
+if [[ "$CHANNEL" == "release" ]]; then
     cargo build --release
 else
-    channel='debug'
     cargo build
 fi
 
-RUSTC="rustc -Zcodegen-backend=$(pwd)/target/$channel/librustc_codegen_cranelift.$dylib_ext -Cpanic=abort -L crate=target/out --out-dir target/out"
-
-rm -r target/out || true
-mkdir -p target/out/clif
+source scripts/ext_config.sh
 
-build_lib mini_core examples/mini_core.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"
 
-$RUSTC examples/example.rs --crate-type lib
-
-# SimpleJIT is broken
-# run_bin examples/mini_core_hello_world.rs
-
-build_example_bin mini_core_hello_world examples/mini_core_hello_world.rs
+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
 
-time $RUSTC target/libcore/src/libcore/lib.rs --crate-type lib --crate-name core -Cincremental=target/incremental_core
-cat target/out/log.txt | sort | uniq -c
-#extract_data libcore.rlib core.o
+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