yetangitu/deltachat-core
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-05 19:42:04 +02:00
Code Issues Releases Wiki Activity

Small etpan/osx tweaks

Browse source 
- Use build_machine as we don't support any form of cross-compilation
  yet.

- Do not try to build the fallback etpan on osx.

Fixes #512
This commit is contained in:
Floris Bruynooghe 2019-01-30 18:38:47 -03:00 • committed by Floris Bruynooghe
parent 9af9247f8b
commit dccdc2fa92
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
meson.build
View file

@ -78,7 +78,7 @@ if libetpan_fallback == false
etpan_version = run_command(libetpan_config, ['--version']).stdout().strip()
message('Dependency libetpan found: @0@. Checking for compatibility.'.format(etpan_version))
if (etpan_version.version_compare('>=1.8')
or host_machine.system() == 'darwin'
or build_machine.system() == 'darwin'
and etpan_version.version_compare('>=1.6'))
message('Check done. Installed libetpan version is compatible.')
libetpan_is_compatible = true
@ -99,6 +99,9 @@ if libetpan_fallback == false
link_args: etpan_libs,
)
else
if build_machine.system() == 'darwin'
error('Fallback libetpan not (yet) supported on OSX')
endif
message('Using libetpan fallback...')
etpan_proj = subproject('libetpan', default_options: ['static-pic-lib=true'])
etpan = etpan_proj.get_variable('dep')