summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Chibisov <contact@kchibisov.com>2020-10-10 00:25:39 +0300
committerGitHub <noreply@github.com>2020-10-10 00:25:39 +0300
commit860adde457c64f4b0e432dd8c90d5b320f3f479f (patch)
tree75fd78c9b169a15b2bd89529e6961f0cd91cf3f9
parent67db9b228d3b6c63484ca4b8fcae577afc0ee22a (diff)
downloadalacritty-860adde457c64f4b0e432dd8c90d5b320f3f479f.tar.gz
alacritty-860adde457c64f4b0e432dd8c90d5b320f3f479f.zip
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.
-rw-r--r--CHANGELOG.md1
-rw-r--r--alacritty/build.rs3
-rw-r--r--alacritty/src/main.rs3
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d2a6889..5aa9806d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Touchpad scrolling scrolled less than it should on macOS/Wayland on scaled outputs
- Incorrect modifiers at startup on X11
- `Add` and `Subtract` keys are now named `NumpadAdd` and `NumpadSubtract` respectively
+- Feature checking when cross compiling between different operating systems
## 0.5.0
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;