mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-11-25 06:46:09 +03:00
Code Issues Projects Releases Wiki Activity

Fix broken overloading of libc close in static OpenWrt build

Browse Source
This commit is contained in:
klzgrad 2023-06-04 09:15:13 +08:00
parent 005cbbe80b
commit 7123630227
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/base/files/scoped_file_linux.cc
View File

@ -81,6 +81,8 @@ bool IsFDOwned(int fd) {
} // namespace base } // namespace base
#ifndef OPENWRT_BUILD_STATIC
using LibcCloseFuncPtr = int (*)(int); using LibcCloseFuncPtr = int (*)(int);
// Load the libc close symbol to forward to from the close wrapper. // Load the libc close symbol to forward to from the close wrapper.
@ -110,3 +112,5 @@ __attribute__((visibility("default"), noinline)) int close(int fd) {
} }
} // extern "C" } // extern "C"
#endif // OPENWRT_BUILD_STATIC

1
src/build/config/openwrt/BUILD.gn
View File

@ -34,6 +34,7 @@ config("compiler") {
if (build_static) { if (build_static) {
# Musl static objects are not built with -fPIC, cannot use -static-pie. # Musl static objects are not built with -fPIC, cannot use -static-pie.
ldflags += [ "-static" ] ldflags += [ "-static" ]
defines += [ "OPENWRT_BUILD_STATIC" ]
} else if (current_cpu == "x86") { } else if (current_cpu == "x86") {
ldflags += [ "-Wl,--dynamic-linker=/lib/ld-musl-i386.so.1" ] ldflags += [ "-Wl,--dynamic-linker=/lib/ld-musl-i386.so.1" ]
} else if (current_cpu == "mipsel") { } else if (current_cpu == "mipsel") {