|
1 | 1 | #![allow(dead_code)] |
2 | 2 |
|
3 | 3 | use std::env; |
4 | | -use std::ops::Bound; |
5 | 4 |
|
6 | 5 | pub fn probe_lua() { |
7 | 6 | let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap(); |
@@ -29,40 +28,7 @@ pub fn probe_lua() { |
29 | 28 | return; |
30 | 29 | } |
31 | 30 |
|
32 | | - // Find using `pkg-config` |
33 | | - |
34 | | - #[cfg(feature = "lua54")] |
35 | | - let (incl_bound, excl_bound, alt_probe, ver) = |
36 | | - ("5.4", "5.5", ["lua5.4", "lua-5.4", "lua54"], "5.4"); |
37 | | - #[cfg(feature = "lua53")] |
38 | | - let (incl_bound, excl_bound, alt_probe, ver) = |
39 | | - ("5.3", "5.4", ["lua5.3", "lua-5.3", "lua53"], "5.3"); |
40 | | - #[cfg(feature = "lua52")] |
41 | | - let (incl_bound, excl_bound, alt_probe, ver) = |
42 | | - ("5.2", "5.3", ["lua5.2", "lua-5.2", "lua52"], "5.2"); |
43 | | - #[cfg(feature = "lua51")] |
44 | | - let (incl_bound, excl_bound, alt_probe, ver) = |
45 | | - ("5.1", "5.2", ["lua5.1", "lua-5.1", "lua51"], "5.1"); |
46 | | - #[cfg(feature = "luajit")] |
47 | | - let (incl_bound, excl_bound, alt_probe, ver) = ("2.0.4", "2.2", [], "JIT"); |
48 | | - |
49 | | - #[rustfmt::skip] |
50 | | - let mut lua = pkg_config::Config::new() |
51 | | - .range_version((Bound::Included(incl_bound), Bound::Excluded(excl_bound))) |
52 | | - .cargo_metadata(true) |
53 | | - .probe(if cfg!(feature = "luajit") { "luajit" } else { "lua" }); |
54 | | - |
55 | | - if lua.is_err() { |
56 | | - for pkg in alt_probe { |
57 | | - lua = pkg_config::Config::new() |
58 | | - .cargo_metadata(true) |
59 | | - .probe(pkg); |
60 | | - |
61 | | - if lua.is_ok() { |
62 | | - break; |
63 | | - } |
64 | | - } |
65 | | - } |
66 | | - |
67 | | - lua.unwrap_or_else(|err| panic!("cannot find Lua{ver} using `pkg-config`: {err}")); |
| 31 | + // This reads [package.metadata.system-deps] from Cargo.toml |
| 32 | + system_deps::Config::new().probe().unwrap(); |
68 | 33 | } |
| 34 | + |
0 commit comments