@@ -81,22 +81,23 @@ cargo_build_release:
8181 $(BUILDER ) build --target=$(TARGET ) --release; \
8282 elif [[ $( TARGET) == * " risc" * ]] && [[ $( TARGET) == * " musl" * ]]; then \
8383 echo " building for risc targets, build with nightly for build-std" ; \
84- RUSTFLAGS=" -Zlocation-detail=none" $(BUILDER ) +nightly build -Z build-std=std,panic_abort,core,alloc,proc_macro -Z build-std-features=panic_immediate_abort --target=$(TARGET ) --bin $(BINARY_NAME ) --release; \
84+ RUSTFLAGS=" -Zlocation-detail=none -Zunstable-options -Cpanic=immediate-abort" $(BUILDER ) +nightly build -Z build-std=std,panic_abort,core,alloc,proc_macro --target=$(TARGET ) --bin $(BINARY_NAME ) --release; \
85+ RUSTFLAGS=" -Zlocation-detail=none -Zunstable-options -Cpanic=immediate-abort" $(BUILDER ) +nightly build -Z build-std=std,panic_abort,core,alloc,proc_macro --target=$(TARGET ) --bin $(BINARY_NAME ) --release; \
8586 elif [[ $( TARGET) == * " s390x" * ]] && [[ $( TARGET) == * " musl" * ]]; then \
8687 echo " building for s390x musl targets, build with nightly for build-std" ; \
87- RUSTFLAGS=" -Zlocation-detail=none" $(BUILDER ) +nightly build -Z build-std=std,panic_abort,core,alloc,proc_macro -Z build-std-features=panic_immediate_abort --target=$(TARGET ) --bin $(BINARY_NAME ) --release; \
88+ RUSTFLAGS=" -Zlocation-detail=none -Zunstable-options -Cpanic=immediate-abort " $(BUILDER ) +nightly build -Z build-std=std,panic_abort,core,alloc,proc_macro --target=$(TARGET ) --bin $(BINARY_NAME ) --release; \
8889 elif [[ $( TARGET) == * " mips" * ]]; then \
8990 echo " building for mips targets, refusing to build with nightly as unable to build-std" ; \
9091 rustup toolchain install $(TARGET ) ; \
9192 rustup component add rust-src --toolchain stable --target $(TARGET ) ; \
9293 cargo install cross --git https://github.com/cross-rs/cross; \
9394 $(BUILDER ) build --target=$(TARGET ) --release; \
9495 elif [[ $( TARGET) == " aarch64-unknown-linux-musl" ]] || [[ $( TARGET) == " armv5te-unknown-linux-musleabi" ]]; then \
95- RUSTFLAGS=" -Zlocation-detail=none -C link-arg=-lgcc" $(BUILDER ) +nightly build -Z build-std=std,panic_abort,core,alloc,proc_macro -Z build-std-features=panic_immediate_abort - -target=$(TARGET ) --bin $(BINARY_NAME ) --release; \
96+ RUSTFLAGS=" -Zlocation-detail=none -C link-arg=-lgcc" $(BUILDER ) +nightly build -Z build-std=std,panic_abort,core,alloc,proc_macro --target=$(TARGET ) --bin $(BINARY_NAME ) --release; \
9697 elif [[ $( TARGET) == * " musl" * ]]; then \
97- RUSTFLAGS=" -Zlocation-detail=none" $(BUILDER ) +nightly build -Z build-std=std,panic_abort,core,alloc,proc_macro -Z build-std-features=panic_immediate_abort --target=$(TARGET ) --bin $(BINARY_NAME ) --release; \
98+ RUSTFLAGS=" -Zlocation-detail=none -Zunstable-options -Cpanic=immediate-abort " $(BUILDER ) +nightly build -Z build-std=std,panic_abort,core,alloc,proc_macro --target=$(TARGET ) --bin $(BINARY_NAME ) --release; \
9899 else \
99- RUSTFLAGS=" -Zlocation-detail=none" $(BUILDER ) +nightly build -Z build-std=std,panic_abort,core,alloc,proc_macro -Z build-std-features=panic_immediate_abort --target= $( TARGET ) --release; \
100+ RUSTFLAGS=" -Zlocation-detail=none -Zunstable-options -Cpanic=immediate-abort " $(BUILDER ) +nightly build -Z build-std=std,panic_abort,core,alloc,proc_macro --target= $( TARGET ) --bin $( BINARY_NAME ) --release; \
100101 fi ; \
101102 fi \
102103 elif [[ $( TARGET) == " aarch64-unknown-freebsd" ]]; then \
0 commit comments