language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-12-23 08:48:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(compile): sentinal conflict with strtab on intel mac (#31587)

Browse source
This commit is contained in:
Divy 2025-12-15 15:06:35 +05:30 • committed by GitHub
parent d17ae8ca9b
commit a97997b8e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cli/lib/version.rs
View file

@ -23,6 +23,11 @@ const IS_RC: bool = option_env!("DENO_RC").is_some();
pub static DENO_VERSION_INFO: std::sync::LazyLock<DenoVersionInfo> =
std::sync::LazyLock::new(|| {
#[cfg(not(all(
debug_assertions,
target_os = "macos",
target_arch = "x86_64"
)))]
let release_channel = libsui::find_section("denover")
.ok()
.flatten()
@ -38,6 +43,15 @@ pub static DENO_VERSION_INFO: std::sync::LazyLock<DenoVersionInfo> =
}
});
#[cfg(all(debug_assertions, target_os = "macos", target_arch = "x86_64"))]
let release_channel = if IS_CANARY {
ReleaseChannel::Canary
} else if IS_RC {
ReleaseChannel::Rc
} else {
ReleaseChannel::Stable
};
DenoVersionInfo {
deno: if release_channel == ReleaseChannel::Canary {
concat!(env!("DENO_VERSION"), "+", env!("GIT_COMMIT_HASH_SHORT"))