From 860adde457c64f4b0e432dd8c90d5b320f3f479f Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Sat, 10 Oct 2020 00:25:39 +0300 Subject: Fix feature checking in cross builds Checking for target os in build.rs doesn't work, since build.rs is running for host, so checking should be done in src. Thus moving 'compile_error!' check from build.rs to main.rs. --- alacritty/build.rs | 3 --- alacritty/src/main.rs | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'alacritty') diff --git a/alacritty/build.rs b/alacritty/build.rs index 46a3de8d..e8e0c114 100644 --- a/alacritty/build.rs +++ b/alacritty/build.rs @@ -1,6 +1,3 @@ -#[cfg(not(any(feature = "x11", feature = "wayland", target_os = "macos", windows)))] -compile_error!(r#"at least one of the "x11"/"wayland" features must be enabled"#); - use gl_generator::{Api, Fallbacks, GlobalGenerator, Profile, Registry}; use std::env; diff --git a/alacritty/src/main.rs b/alacritty/src/main.rs index 09296f60..19ae917b 100644 --- a/alacritty/src/main.rs +++ b/alacritty/src/main.rs @@ -8,6 +8,9 @@ // See https://msdn.microsoft.com/en-us/library/4cc7ya5b.aspx for more details. #![windows_subsystem = "windows"] +#[cfg(not(any(feature = "x11", feature = "wayland", target_os = "macos", windows)))] +compile_error!(r#"at least one of the "x11"/"wayland" features must be enabled"#); + #[cfg(target_os = "macos")] use std::env; use std::error::Error; -- cgit