Merge pull request #1108 from jyn514/cargo-target-dir

Fix compiling with CARGO_TARGET_DIR
This commit is contained in:
bjorn3 2020-11-04 07:36:10 +01:00 committed by GitHub
commit 1aaa02401d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions

View File

@ -26,6 +26,7 @@ while [[ $# != 0 ]]; do
done done
# Build cg_clif # Build cg_clif
unset CARGO_TARGET_DIR
export RUSTFLAGS="-Zrun_dsymutil=no" export RUSTFLAGS="-Zrun_dsymutil=no"
if [[ "$CHANNEL" == "release" ]]; then if [[ "$CHANNEL" == "release" ]]; then
cargo build --release cargo build --release

View File

@ -24,6 +24,7 @@ git checkout -- .
git checkout 804a7a21b9e673a482797aa289a18ed480e4d813 git checkout 804a7a21b9e673a482797aa289a18ed480e4d813
# build with cg_llvm for perf comparison # build with cg_llvm for perf comparison
unset CARGO_TARGET_DIR
cargo build cargo build
mv target/debug/main raytracer_cg_llvm mv target/debug/main raytracer_cg_llvm
popd popd