smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #703 from kiwix/fix-mipsel-cross-compilation 

Use "host_machine", not "target_machine" for cross-compilation
This commit is contained in:
Kelson 2022-02-09 07:09:56 +01:00 committed by GitHub
parent 19dd068e5a f2088d7fe0
commit ec94d9bfd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -19,11 +19,11 @@ if wrapper.contains('java')
endif endif
# See https://github.com/kiwix/libkiwix/issues/371 # See https://github.com/kiwix/libkiwix/issues/371
if ['arm', 'mips', 'm68k', 'ppc', 'sh4'].contains(target_machine.cpu_family()) if ['arm', 'mips', 'm68k', 'ppc', 'sh4'].contains(host_machine.cpu_family())
extra_libs += '-latomic' extra_libs += '-latomic'
endif endif
if (compiler.get_id() == 'gcc' and build_machine.system() == 'linux') or target_machine.system() == 'freebsd' if (compiler.get_id() == 'gcc' and build_machine.system() == 'linux') or host_machine.system() == 'freebsd'
# C++ std::thread is implemented using pthread on linux by gcc # C++ std::thread is implemented using pthread on linux by gcc
thread_dep = dependency('threads') thread_dep = dependency('threads')
else else
@ -51,12 +51,12 @@ endif
extra_cflags = '' extra_cflags = ''
if target_machine.system() == 'windows' and static_deps if host_machine.system() == 'windows' and static_deps
add_project_arguments('-DCURL_STATICLIB', language : 'cpp') add_project_arguments('-DCURL_STATICLIB', language : 'cpp')
extra_cflags += '-DCURL_STATICLIB' extra_cflags += '-DCURL_STATICLIB'
endif endif
if target_machine.system() == 'windows' if host_machine.system() == 'windows'
add_project_arguments('-DNOMINMAX', language: 'cpp') add_project_arguments('-DNOMINMAX', language: 'cpp')
endif endif