From 03798c3b1da814d05e7ece522b1084e6cfa7f2b2 Mon Sep 17 00:00:00 2001 From: Connor Peet Date: Fri, 18 Nov 2022 10:34:34 -0800 Subject: [PATCH] cli: look for ldconfig in the right location for 32 bit installs (#166723) See https://github.com/microsoft/vscode-remote-release/issues/7495\#issuecomment-1320331537 --- cli/src/util/prereqs.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs index 46bb0dc6dbf..f2e724b570c 100644 --- a/cli/src/util/prereqs.rs +++ b/cli/src/util/prereqs.rs @@ -157,7 +157,10 @@ async fn check_is_nixos() -> bool { async fn check_glibcxx_version() -> Result<(), String> { let mut libstdc_path: Option = None; + #[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))] const DEFAULT_LIB_PATH: &str = "/usr/lib64/libstdc++.so.6"; + #[cfg(any(target_arch = "x86", target_arch = "arm"))] + const DEFAULT_LIB_PATH: &str = "/usr/lib/libstdc++.so.6"; const LDCONFIG_PATH: &str = "/sbin/ldconfig"; if fs::metadata(DEFAULT_LIB_PATH).await.is_ok() {