mirror of
https://github.com/fish-shell/fish-shell.git
synced 2024-11-25 09:39:52 +08:00
Upgrade to rsconf 0.2.0
This commit is contained in:
parent
35a16e3713
commit
2faf1159fa
4
Cargo.lock
generated
4
Cargo.lock
generated
|
@ -433,9 +433,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "rsconf"
|
||||
version = "0.1.2"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7b9653c00e095416c7586382524a5ede22b9dec6f067879bd7eed21429721e6d"
|
||||
checksum = "5a21859ed369f0e06a22264093fcb2f3baec914b5be39f3fb8533056cad136cc"
|
||||
dependencies = [
|
||||
"cc",
|
||||
]
|
||||
|
|
|
@ -45,7 +45,7 @@ serial_test = { version = "1.0.0", default-features = false }
|
|||
|
||||
[build-dependencies]
|
||||
cc = "1.0.94"
|
||||
rsconf = "0.1.2"
|
||||
rsconf = "0.2.0"
|
||||
|
||||
[lib]
|
||||
crate-type = ["rlib"]
|
||||
|
|
10
build.rs
10
build.rs
|
@ -75,19 +75,19 @@ fn detect_cfgs(target: &mut Target) {
|
|||
("gettext", &have_gettext),
|
||||
// See if libc supports the thread-safe localeconv_l(3) alternative to localeconv(3).
|
||||
("localeconv_l", &|target| {
|
||||
Ok(target.has_symbol("localeconv_l", None))
|
||||
Ok(target.has_symbol("localeconv_l"))
|
||||
}),
|
||||
("FISH_USE_POSIX_SPAWN", &|target| {
|
||||
Ok(target.has_header("spawn.h"))
|
||||
}),
|
||||
("HAVE_PIPE2", &|target| {
|
||||
Ok(target.has_symbol("pipe2", None))
|
||||
Ok(target.has_symbol("pipe2"))
|
||||
}),
|
||||
("HAVE_EVENTFD", &|target| {
|
||||
Ok(target.has_header("sys/eventfd.h"))
|
||||
}),
|
||||
("HAVE_WAITSTATUS_SIGNAL_RET", &|target| {
|
||||
Ok(target.r#if("WEXITSTATUS(0x007f) == 0x7f", "sys/wait.h"))
|
||||
Ok(target.r#if("WEXITSTATUS(0x007f) == 0x7f", &["sys/wait.h"]))
|
||||
}),
|
||||
] {
|
||||
match handler(target) {
|
||||
|
@ -144,13 +144,13 @@ fn have_gettext(target: &Target) -> Result<bool, Box<dyn Error>> {
|
|||
for symbol in &symbols {
|
||||
// Historically, libintl was required in order to use gettext() and co, but that
|
||||
// functionality was subsumed by some versions of libc.
|
||||
if target.has_symbol(symbol, None) {
|
||||
if target.has_symbol(symbol) {
|
||||
// No need to link anything special for this symbol
|
||||
found += 1;
|
||||
continue;
|
||||
}
|
||||
for library in ["intl", "gettextlib"] {
|
||||
if target.has_symbol(symbol, library) {
|
||||
if target.has_symbol_in(symbol, &[library]) {
|
||||
libraries.push(library);
|
||||
found += 1;
|
||||
continue;
|
||||
|
|
Loading…
Reference in New Issue
Block a user