Skip to content

Commit ba19580

Browse files
authored
Unrolled build for rust-lang#140141
Rollup merge of rust-lang#140141 - thaliaarchi:env-consts/zkvm, r=joboet Move zkVM constants into `sys::env_consts` I missed this in rust-lang#139868. Its `mod` declaration was removed, but the contents were not moved. r? joboet
2 parents 3c877f6 + dfc8f02 commit ba19580

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

library/std/src/sys/env_consts.rs

+11
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,17 @@ pub mod os {
389389
pub const EXE_EXTENSION: &str = "exe";
390390
}
391391

392+
#[cfg(target_os = "zkvm")]
393+
pub mod os {
394+
pub const FAMILY: &str = "";
395+
pub const OS: &str = "";
396+
pub const DLL_PREFIX: &str = "";
397+
pub const DLL_SUFFIX: &str = ".elf";
398+
pub const DLL_EXTENSION: &str = "elf";
399+
pub const EXE_SUFFIX: &str = ".elf";
400+
pub const EXE_EXTENSION: &str = "elf";
401+
}
402+
392403
// The fallback when none of the other gates match.
393404
#[else]
394405
pub mod os {

library/std/src/sys/pal/zkvm/env.rs

-9
This file was deleted.

0 commit comments

Comments
 (0)