diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2020-11-08 17:35:59 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2020-11-08 17:35:59 +0100 |
| commit | cf3aa64c662586548f1c5cebbde3cc5864a1cd45 (patch) | |
| tree | a8bd37e3a87a81b5a6e1508571516e1d00fe1d10 /scripts | |
| parent | df45a06f8959cb5ba52b5ba1d76df42527c1a448 (diff) | |
| download | rust-cf3aa64c662586548f1c5cebbde3cc5864a1cd45.tar.gz rust-cf3aa64c662586548f1c5cebbde3cc5864a1cd45.zip | |
Better build dir layout
It now matches the layout used by rustc itself
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config.sh | 6 | ||||
| -rwxr-xr-x | scripts/test_bootstrap.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/config.sh b/scripts/config.sh index 10c0ec0e293..1ac6bf265b4 100644 --- a/scripts/config.sh +++ b/scripts/config.sh @@ -43,17 +43,17 @@ fi dir=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd) -export RUSTC=$dir"/cg_clif" +export RUSTC=$dir"/bin/cg_clif" export RUSTFLAGS=$linker" "$RUSTFLAGS export RUSTDOCFLAGS=$linker' -Cpanic=abort -Zpanic-abort-tests '\ -'-Zcodegen-backend='$dir'/librustc_codegen_cranelift.'$dylib_ext' --sysroot '$dir'/sysroot' +'-Zcodegen-backend='$dir'/lib/librustc_codegen_cranelift.'$dylib_ext' --sysroot '$dir # FIXME remove once the atomic shim is gone if [[ $(uname) == 'Darwin' ]]; then export RUSTFLAGS="$RUSTFLAGS -Clink-arg=-undefined -Clink-arg=dynamic_lookup" fi -export LD_LIBRARY_PATH="$dir:$(rustc --print sysroot)/lib:$dir/target/out:$dir/sysroot/lib/rustlib/$TARGET_TRIPLE/lib" +export LD_LIBRARY_PATH="$dir/lib:$(rustc --print sysroot)/lib:$dir/target/out:$dir/sysroot/lib/rustlib/$TARGET_TRIPLE/lib" export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH export CG_CLIF_DISPLAY_CG_TIME=1 diff --git a/scripts/test_bootstrap.sh b/scripts/test_bootstrap.sh index e8d5c628638..db69541b226 100755 --- a/scripts/test_bootstrap.sh +++ b/scripts/test_bootstrap.sh @@ -48,7 +48,7 @@ cat > config.toml <<EOF ninja = false [build] -rustc = "$(pwd)/../build/cg_clif" +rustc = "$(pwd)/../build/bin/cg_clif" cargo = "$(rustup which cargo)" full-bootstrap = true local-rebuild = true |