michael/mlua
michael
/
mlua
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

I'm not going to release this as is, but I need to weigh my options

This commit is contained in:
kyren 2018-02-16 23:43:30 -05:00
parent dec360f78f
commit 52eedfd378
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -30,6 +30,7 @@ compiletest_rs = { version = "0.3", optional = true }
[build-dependencies] [build-dependencies]
gcc = { version = "0.3.52", optional = true } gcc = { version = "0.3.52", optional = true }
rustc_version = { version = "0.2" }
[dev-dependencies] [dev-dependencies]
rustyline = "1.0.0" rustyline = "1.0.0"

6
build.rs
View File

@ -1,13 +1,15 @@
#[cfg(feature = "builtin-lua")] #[cfg(feature = "builtin-lua")]
extern crate gcc; extern crate gcc;
extern crate rustc_version;
use std::env; use std::env;
fn main() { fn main() {
let target_os = env::var("CARGO_CFG_TARGET_OS"); let target_os = env::var("CARGO_CFG_TARGET_OS");
let target_family = env::var("CARGO_CFG_TARGET_FAMILY"); let target_family = env::var("CARGO_CFG_TARGET_FAMILY");
if target_family == Ok("windows".to_string())
if target_family == Ok("windows".to_string()) { && rustc_version::version().unwrap() == rustc_version::Version::parse("1.24.0").unwrap()
{
// Error handling is completely broken on windows with // Error handling is completely broken on windows with
// https://github.com/rust-lang/rust/pull/46833 merged, and this includes stable rustc // https://github.com/rust-lang/rust/pull/46833 merged, and this includes stable rustc
// 1.24.0+. `#[unwind]` fixes error handling on windows, but requires nightly! This // 1.24.0+. `#[unwind]` fixes error handling on windows, but requires nightly! This