Merge branch 'beta-prerelease' of https://github.com/cuviper/rust into rollup

2026-05-16 13:05:18 +03:00 · 2018-01-26 06:52:55 -08:00
parent afc977fa23 a76bb8806a
commit b741d7d7ac
1 changed files with 5 additions and 1 deletions
@@ -771,7 +771,11 @@ fn openssl_install_dir(&self, target: Interned<String>) -> Option<PathBuf> {
    fn release(&self, num: &str) -> String {
        match &self.config.channel[..] {
            "stable" => num.to_string(),
-            "beta" => format!("{}-beta.{}", num, self.beta_prerelease_version()),
+            "beta" => if self.rust_info.is_git() {
+                format!("{}-beta.{}", num, self.beta_prerelease_version())
+            } else {
+                format!("{}-beta", num)
+            },
            "nightly" => format!("{}-nightly", num),
            _ => format!("{}-dev", num),
        }