Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
epel9
Igor Raits 5 years ago
parent c552077126
commit 0d393fcfe2
No known key found for this signature in database
GPG Key ID: 695714BD1BBC5F4C

@ -0,0 +1,36 @@
From e7626a25471d2db29e7cdee81308ee4604b41544 Mon Sep 17 00:00:00 2001
From: Igor Raits <i.gnatenko.brain@gmail.com>
Date: Mon, 2 Mar 2020 12:14:11 +0100
Subject: [PATCH] build.rs: Simplify check for version
This also fixes build with rustc shipped by distributions.
Fixes: https://gitlab.com/CreepySkeleton/proc-macro-error/issues/8
Signed-off-by: Igor Raits <i.gnatenko.brain@gmail.com>
---
build.rs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.rs b/build.rs
index 17cf408..3c1196f 100644
--- a/build.rs
+++ b/build.rs
@@ -1,11 +1,11 @@
fn main() {
- let (version, channel, _) = version_check::triple().unwrap();
-
- if !channel.is_nightly() {
+ if !version_check::is_feature_flaggable().unwrap_or(false) {
println!("cargo:rustc-cfg=use_fallback");
}
- if version.at_most("1.38.0") || !channel.is_stable() {
+ if version_check::is_max_version("1.38.0").unwrap_or(false)
+ || !version_check::Channel::read().unwrap().is_stable()
+ {
println!("cargo:rustc-cfg=skip_ui_tests");
}
}
--
2.25.1

@ -17,6 +17,8 @@ Source: %{crates_source}
# Initial patched metadata # Initial patched metadata
# * unpin the toml dependency # * unpin the toml dependency
Patch0: proc-macro-error-fix-metadata.diff Patch0: proc-macro-error-fix-metadata.diff
# https://gitlab.com/CreepySkeleton/proc-macro-error/-/merge_requests/25
Patch0001: 0001-build.rs-Simplify-check-for-version.patch
ExclusiveArch: %{rust_arches} ExclusiveArch: %{rust_arches}
%if %{__cargo_skip_build} %if %{__cargo_skip_build}

Loading…
Cancel
Save