Skip to content

Commit 6a739b3

Browse files
authored
Merge pull request #1132 from Uriopass/master
Don't set RUSTFLAGS when no specific linker is needed
2 parents ae6daf7 + 3eb649c commit 6a739b3

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

scripts/config.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ fi
4444
dir=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
4545

4646
export RUSTC=$dir"/bin/cg_clif"
47-
export RUSTFLAGS=$linker" "$RUSTFLAGS
47+
48+
if [ ! -z $linker ]; then
49+
export RUSTFLAGS=$linker" "$RUSTFLAGS
50+
fi
51+
4852
export RUSTDOCFLAGS=$linker' -Cpanic=abort -Zpanic-abort-tests '\
4953
'-Zcodegen-backend='$dir'/lib/librustc_codegen_cranelift.'$dylib_ext' --sysroot '$dir
5054

0 commit comments

Comments
 (0)