Skip to content

Commit 30a7425

Browse files
committed
Auto merge of #798 - vojtechkral:glibc2.26, r=alexcrichton
Fix glibc 2.26 incompatibilities #788 Hopefully the `xlocale.h` → `locale.h` change won't break something else somewhere...
2 parents e8bc1cf + 4ed612c commit 30a7425

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

libc-test/build.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ fn main() {
142142

143143
if !netbsd && !openbsd && !uclibc {
144144
cfg.header("execinfo.h");
145-
cfg.header("xlocale.h");
146145
}
147146

148147
if openbsd {
@@ -158,6 +157,7 @@ fn main() {
158157
cfg.header("mach/mach_time.h");
159158
cfg.header("malloc/malloc.h");
160159
cfg.header("util.h");
160+
cfg.header("xlocale.h");
161161
cfg.header("sys/xattr.h");
162162
cfg.header("sys/sys_domain.h");
163163
if target.starts_with("x86") {
@@ -409,6 +409,7 @@ fn main() {
409409
"ERROR_NOTHING_TO_TERMINATE" if mingw => true,
410410

411411
"SIG_IGN" => true, // sighandler_t weirdness
412+
"SIGUNUSED" => true, // removed in glibc 2.26
412413

413414
// types on musl are defined a little differently
414415
n if musl && n.contains("__SIZEOF_PTHREAD") => true,

0 commit comments

Comments
 (0)