diff options
| author | Antoni Boucher <bouanto@zoho.com> | 2022-06-06 22:04:37 -0400 |
|---|---|---|
| committer | Antoni Boucher <bouanto@zoho.com> | 2022-06-06 22:04:37 -0400 |
| commit | 3fac982e07a859ffedba37865bcc6c508e47893b (patch) | |
| tree | a12775cef836537f2c2dad6a3f32788285c5cdf2 /compiler/rustc_codegen_gcc/config.sh | |
| parent | 50b00252aeb77b10db04d65dc9e12ce758def4b5 (diff) | |
| parent | e8dca3e87d164d2806098c462c6ce41301341f68 (diff) | |
| download | rust-3fac982e07a859ffedba37865bcc6c508e47893b.tar.gz rust-3fac982e07a859ffedba37865bcc6c508e47893b.zip | |
Merge commit 'e8dca3e87d164d2806098c462c6ce41301341f68' into sync_from_cg_gcc
Diffstat (limited to 'compiler/rustc_codegen_gcc/config.sh')
| -rw-r--r-- | compiler/rustc_codegen_gcc/config.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_gcc/config.sh b/compiler/rustc_codegen_gcc/config.sh index a932c1c8372..b25e215fb9e 100644 --- a/compiler/rustc_codegen_gcc/config.sh +++ b/compiler/rustc_codegen_gcc/config.sh @@ -2,7 +2,7 @@ set -e export CARGO_INCREMENTAL=0 -if [ -f ./gcc_path ]; then +if [ -f ./gcc_path ]; then export GCC_PATH=$(cat gcc_path) else echo 'Please put the path to your custom build of libgccjit in the file `gcc_path`, see Readme.md for details' @@ -38,7 +38,7 @@ if [[ "$HOST_TRIPLE" != "$TARGET_TRIPLE" ]]; then fi fi -export RUSTFLAGS="$linker -Cpanic=abort -Csymbol-mangling-version=v0 -Cdebuginfo=2 -Clto=off -Zpanic-abort-tests -Zcodegen-backend=$(pwd)/target/${CHANNEL:-debug}/librustc_codegen_gcc.$dylib_ext --sysroot $(pwd)/build_sysroot/sysroot" +export RUSTFLAGS="$CG_RUSTFLAGS $linker -Cpanic=abort -Csymbol-mangling-version=v0 -Cdebuginfo=2 -Clto=off -Zpanic-abort-tests -Zcodegen-backend=$(pwd)/target/${CHANNEL:-debug}/librustc_codegen_gcc.$dylib_ext --sysroot $(pwd)/build_sysroot/sysroot" # FIXME(antoyo): remove once the atomic shim is gone if [[ `uname` == 'Darwin' ]]; then |