user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Antoni Boucher 2023-06-11 20:01:24 -04:00
parent ef037e6d30
commit 8bba64673c
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
build_sysroot/build_sysroot.sh
View file

@ -28,3 +28,11 @@ fi
# Copy files to sysroot
mkdir -p sysroot/lib/rustlib/$TARGET_TRIPLE/lib/
cp -r target/$TARGET_TRIPLE/$sysroot_channel/deps/* sysroot/lib/rustlib/$TARGET_TRIPLE/lib/
# Since we can't override the sysroot for the UI tests anymore, we create a new toolchain and manually overwrite the sysroot directory.
my_toolchain_dir=$HOME/.rustup/toolchains/my_toolchain
rm -rf $my_toolchain_dir
rust_toolchain=$(cat ../rust-toolchain | grep channel | sed 's/channel = "\(.*\)"/\1/')
cp -r $HOME/.rustup/toolchains/$rust_toolchain-$TARGET_TRIPLE $my_toolchain_dir
rm -rf $my_toolchain_dir/lib/rustlib/$TARGET_TRIPLE/
cp -r ../build_sysroot/sysroot/* $my_toolchain_dir

2
src/lib.rs
View file

@ -1,5 +1,3 @@
// FIXME: simple programs now segfault with a sysroot compile in release mode.
/*
* TODO(antoyo): implement equality in libgccjit based on https://zpz.github.io/blog/overloading-equality-operator-in-cpp-class-hierarchy/ (for type equality?)
* TODO(antoyo): support #[inline] attributes.

8
test.sh
View file

@ -213,13 +213,7 @@ function setup_rustc() {
rm config.toml || true
# TODO: move these lines to build_sysroot/build_sysroot.sh instead to avoid having to rebuild stage0 libraries everytime?
# Since we can't override the sysroot anymore, we create a new toolchain and manually overwrite the sysroot directory.
my_toolchain_dir=$HOME/.rustup/toolchains/my_toolchain
rm -rf $my_toolchain_dir
cp -r $HOME/.rustup/toolchains/$rust_toolchain-$TARGET_TRIPLE $my_toolchain_dir
rm -rf $my_toolchain_dir/lib/rustlib/x86_64-unknown-linux-gnu/
cp -r ../build_sysroot/sysroot/* $my_toolchain_dir
cat > config.toml <<EOF
changelog-seen = 2
@ -230,10 +224,8 @@ deny-warnings = false
[build]
cargo = "$my_toolchain_dir/bin/cargo"
#cargo = "$(rustup which cargo)"
local-rebuild = true
rustc = "$my_toolchain_dir/bin/rustc"
#rustc = "$HOME/.rustup/toolchains/$rust_toolchain-$TARGET_TRIPLE/bin/rustc"
[target.x86_64-unknown-linux-gnu]
llvm-filecheck = "`which FileCheck-10 || which FileCheck-11 || which FileCheck-12 || which FileCheck-13 || which FileCheck-14`"