mirror of
https://github.com/oxen-io/lokinet
synced 2023-12-14 06:53:00 +01:00
Merge pull request #2130 from XutaxKamay/dev
fix openwrt mips32 static build
This commit is contained in:
commit
3de23c3eba
|
@ -242,6 +242,7 @@ set(openssl_system_env "")
|
||||||
set(openssl_arch "")
|
set(openssl_arch "")
|
||||||
set(openssl_configure_command ./config)
|
set(openssl_configure_command ./config)
|
||||||
set(openssl_flags "CFLAGS=${deps_CFLAGS}")
|
set(openssl_flags "CFLAGS=${deps_CFLAGS}")
|
||||||
|
set(unbound_ldflags "")
|
||||||
if(CMAKE_CROSSCOMPILING)
|
if(CMAKE_CROSSCOMPILING)
|
||||||
if(ARCH_TRIPLET STREQUAL x86_64-w64-mingw32)
|
if(ARCH_TRIPLET STREQUAL x86_64-w64-mingw32)
|
||||||
set(openssl_arch mingw64)
|
set(openssl_arch mingw64)
|
||||||
|
@ -258,6 +259,9 @@ if(CMAKE_CROSSCOMPILING)
|
||||||
set(openssl_arch linux-mips64)
|
set(openssl_arch linux-mips64)
|
||||||
elseif(ARCH_TRIPLET STREQUAL mips-linux-gnu)
|
elseif(ARCH_TRIPLET STREQUAL mips-linux-gnu)
|
||||||
set(openssl_arch linux-mips32)
|
set(openssl_arch linux-mips32)
|
||||||
|
elseif(ARCH_TRIPLET STREQUAL mips-openwrt-linux)
|
||||||
|
set(unbound_ldflags "-latomic")
|
||||||
|
set(openssl_arch linux-mips32)
|
||||||
elseif(ARCH_TRIPLET STREQUAL mipsel-linux-gnu)
|
elseif(ARCH_TRIPLET STREQUAL mipsel-linux-gnu)
|
||||||
set(openssl_arch linux-mips)
|
set(openssl_arch linux-mips)
|
||||||
elseif(ARCH_TRIPLET STREQUAL aarch64-linux-gnu OR ARCH_TRIPLET STREQUAL aarch64-openwrt-linux-musl)
|
elseif(ARCH_TRIPLET STREQUAL aarch64-linux-gnu OR ARCH_TRIPLET STREQUAL aarch64-openwrt-linux-musl)
|
||||||
|
@ -319,7 +323,7 @@ build_external(unbound
|
||||||
--enable-static --with-libunbound-only --with-pic
|
--enable-static --with-libunbound-only --with-pic
|
||||||
--$<IF:$<BOOL:${WITH_LTO}>,enable,disable>-flto --with-ssl=${DEPS_DESTDIR}
|
--$<IF:$<BOOL:${WITH_LTO}>,enable,disable>-flto --with-ssl=${DEPS_DESTDIR}
|
||||||
--with-libexpat=${DEPS_DESTDIR}
|
--with-libexpat=${DEPS_DESTDIR}
|
||||||
"CC=${deps_cc}" "CFLAGS=${deps_CFLAGS}"
|
"CC=${deps_cc}" "CFLAGS=${deps_CFLAGS}" "LDFLAGS=${unbound_ldflags}"
|
||||||
)
|
)
|
||||||
add_static_target(libunbound unbound_external libunbound.a)
|
add_static_target(libunbound unbound_external libunbound.a)
|
||||||
if(NOT WIN32)
|
if(NOT WIN32)
|
||||||
|
|
Loading…
Reference in a new issue