cli: fix GLIBC version requirement hardcoded in error message (micros…

…oft#202605) Fixes microsoft#202082
membrane-io · Jan 16, 2024 · f58d7ff · f58d7ff
1 parent 7b3a15c
commit f58d7ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cli/src/util/errors.rs b/cli/src/util/errors.rs
@@ -471,7 +471,7 @@ pub enum CodeError {
 
 	#[error("platform not currently supported: {0}")]
 	UnsupportedPlatform(String),
-	#[error("This machine not meet {name}'s prerequisites, expected either...: {bullets}")]
+	#[error("This machine does not meet {name}'s prerequisites, expected either...: {bullets}")]
 	PrerequisitesFailed { name: &'static str, bullets: String },
 	#[error("failed to spawn process: {0:?}")]
 	ProcessSpawnFailed(std::io::Error),

diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
@@ -141,8 +141,8 @@ async fn check_glibc_version() -> Result<(), String> {
 			Ok(())
 		} else {
 			Err(format!(
-				"find GLIBC >= 2.17 (but found {} instead) for GNU environments",
-				v
+				"find GLIBC >= {} (but found {} instead) for GNU environments",
+				*MIN_LDD_VERSION, v
 			))
 		};
 	}
@@ -201,7 +201,8 @@ fn check_for_sufficient_glibcxx_versions(contents: Vec<u8>) -> Result<(), String
 
 	if !all_versions.iter().any(|v| &*MIN_CXX_VERSION >= v) {
 		return Err(format!(
-			"find GLIBCXX >= 3.4.18 (but found {} instead) for GNU environments",
+			"find GLIBCXX >= {} (but found {} instead) for GNU environments",
+			*MIN_CXX_VERSION,
 			all_versions
 				.iter()
 				.map(String::from)