From d5bc9c8c24f220bc08701c8c8da10cb98ac4b291 Mon Sep 17 00:00:00 2001 From: Alex Orlenko Date: Mon, 27 Jan 2020 21:21:50 +0000 Subject: Combine lua-vendored and luajit-vendored features into "vendored" --- build/find_vendored.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'build/find_vendored.rs') diff --git a/build/find_vendored.rs b/build/find_vendored.rs index a1bb76a..92efe2e 100644 --- a/build/find_vendored.rs +++ b/build/find_vendored.rs @@ -1,23 +1,20 @@ use std::path::PathBuf; -#[cfg(feature = "lua-vendored")] +#[cfg(any(feature = "lua53", feature = "lua52", feature = "lua51"))] use lua_src; -#[cfg(feature = "luajit-vendored")] +#[cfg(feature = "luajit")] use luajit_src; pub fn probe_lua() -> PathBuf { - #[cfg(all(feature = "lua53", feature = "lua-vendored"))] + #[cfg(feature = "lua53")] let artifacts = lua_src::Build::new().build(lua_src::Lua53); - #[cfg(all(feature = "lua52", feature = "lua-vendored"))] + #[cfg(feature = "lua52")] let artifacts = lua_src::Build::new().build(lua_src::Lua52); - #[cfg(all(feature = "lua51", feature = "lua-vendored"))] + #[cfg(feature = "lua51")] let artifacts = lua_src::Build::new().build(lua_src::Lua51); - #[cfg(feature = "luajit-vendored")] + #[cfg(feature = "luajit")] let artifacts = luajit_src::Build::new().build(); - #[cfg(all(feature = "luajit", feature = "lua-vendored"))] - let artifacts = lua_src::Build::new().build(lua_src::Lua51); // Invalid case! Workaround to get panic - artifacts.print_cargo_metadata(); artifacts.include_dir().to_owned() } -- cgit v1.2.3