Skip to content

Commit 5051c34

Browse files
committed
Use default value if QNX_TARGET is not set
1 parent 14cb365 commit 5051c34

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Diff for: compiler/rustc_target/src/spec/targets/aarch64_unknown_nto_qnx710_iosock.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub(crate) fn target() -> Target {
1818
// More information:
1919
// https://www.qnx.com/developers/docs/7.1/index.html#com.qnx.doc.neutrino.io_sock/topic/migrate_app.html
2020
fn get_iosock_param() -> &'static str {
21-
let target_dir = std::env::var("QNX_TARGET").expect("Environment variable QNX_TARGET is set");
21+
let target_dir = std::env::var("QNX_TARGET").unwrap_or_else(|_| "PLEASE_SET_ENV_VAR_QNX_TARGET".into());
2222
let linker_param = format!("-L{target_dir}/aarch64le/io-sock/lib");
2323

2424
linker_param.leak()

Diff for: tests/assembly/targets/targets-elf.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
//@ [aarch64_unknown_nto_qnx710] compile-flags: --target aarch64-unknown-nto-qnx710
5959
//@ [aarch64_unknown_nto_qnx710] needs-llvm-components: aarch64
6060
//@ revisions: aarch64_unknown_nto_qnx710_iosock
61-
//@ [aarch64_unknown_nto_qnx710] compile-flags: --target aarch64-unknown-nto-qnx710_iosock
62-
//@ [aarch64_unknown_nto_qnx710] needs-llvm-components: aarch64
61+
//@ [aarch64_unknown_nto_qnx710_iosock] compile-flags: --target aarch64-unknown-nto-qnx710_iosock
62+
//@ [aarch64_unknown_nto_qnx710_iosock] needs-llvm-components: aarch64
6363
//@ revisions: aarch64_unknown_openbsd
6464
//@ [aarch64_unknown_openbsd] compile-flags: --target aarch64-unknown-openbsd
6565
//@ [aarch64_unknown_openbsd] needs-llvm-components: aarch64
@@ -549,6 +549,9 @@
549549
//@ revisions: x86_64_pc_nto_qnx710
550550
//@ [x86_64_pc_nto_qnx710] compile-flags: --target x86_64-pc-nto-qnx710
551551
//@ [x86_64_pc_nto_qnx710] needs-llvm-components: x86
552+
//@ revisions: x86_64_pc_nto_qnx710_iosock
553+
//@ [x86_64_pc_nto_qnx710_iosock compile-flags: --target x86_64-pc-nto-qnx710_iosock
554+
//@ [x86_64_pc_nto_qnx710_iosock needs-llvm-components: x86
552555
//@ revisions: x86_64_pc_solaris
553556
//@ [x86_64_pc_solaris] compile-flags: --target x86_64-pc-solaris
554557
//@ [x86_64_pc_solaris] needs-llvm-components: x86

0 commit comments

Comments
 (0)