From 5ee7ae8a274fcc58754aa5a91a14b1dedbb87583 Mon Sep 17 00:00:00 2001 From: Mateusz MikuĊ‚a Date: Tue, 1 Sep 2020 00:30:45 +0200 Subject: Disable WinPTY with windows-gnu toolchain Co-authored-by: Christian Duerr --- alacritty_terminal/src/tty/windows/mod.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'alacritty_terminal/src') diff --git a/alacritty_terminal/src/tty/windows/mod.rs b/alacritty_terminal/src/tty/windows/mod.rs index 039dbaa6..27b65e58 100644 --- a/alacritty_terminal/src/tty/windows/mod.rs +++ b/alacritty_terminal/src/tty/windows/mod.rs @@ -10,19 +10,19 @@ use crate::term::SizeInfo; use crate::tty::windows::child::ChildExitWatcher; use crate::tty::{ChildEvent, EventedPty, EventedReadWrite}; -#[cfg(feature = "winpty")] +#[cfg(all(feature = "winpty", target_env = "msvc"))] mod automatic_backend; mod child; mod conpty; -#[cfg(feature = "winpty")] +#[cfg(all(feature = "winpty", target_env = "msvc"))] mod winpty; -#[cfg(not(feature = "winpty"))] +#[cfg(not(all(feature = "winpty", target_env = "msvc")))] use conpty::Conpty as Backend; -#[cfg(not(feature = "winpty"))] +#[cfg(not(all(feature = "winpty", target_env = "msvc")))] use mio_anonymous_pipes::{EventedAnonRead as ReadPipe, EventedAnonWrite as WritePipe}; -#[cfg(feature = "winpty")] +#[cfg(all(feature = "winpty", target_env = "msvc"))] use automatic_backend::{ EventedReadablePipe as ReadPipe, EventedWritablePipe as WritePipe, PtyBackend as Backend, }; @@ -39,12 +39,12 @@ pub struct Pty { child_watcher: ChildExitWatcher, } -#[cfg(not(feature = "winpty"))] +#[cfg(not(all(feature = "winpty", target_env = "msvc")))] pub fn new(config: &Config, size: &SizeInfo, window_id: Option) -> Pty { conpty::new(config, size, window_id).expect("Failed to create ConPTY backend") } -#[cfg(feature = "winpty")] +#[cfg(all(feature = "winpty", target_env = "msvc"))] pub fn new(config: &Config, size: &SizeInfo, window_id: Option) -> Pty { automatic_backend::new(config, size, window_id) } -- cgit