diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-23 13:45:05 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-05-05 21:14:54 +0200 |
| commit | 8a4173987edfeeb7e49c70617d43e3adc911d333 (patch) | |
| tree | 24360e0c3fe2b2138f9a291f143f9a6667c53510 /Repository.mk | |
| parent | Switch OPENSSL config var from negative to positive (diff) | |
| download | core-8a4173987edfeeb7e49c70617d43e3adc911d333.tar.gz core-8a4173987edfeeb7e49c70617d43e3adc911d333.zip | |
WASM: add initial support for Emscripten cross build
- configure with:
- --host=wasm64-local-emscripten
- had to make a few externals optional, so adding:
- --disable-nss
- --disable-cmis
- --disable-curl
Change-Id: I48d1c73d2675ad2e2beaf2c341578199efbd24ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111130
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Repository.mk b/Repository.mk index 6af72d71058e..db52290e90c7 100644 --- a/Repository.mk +++ b/Repository.mk @@ -552,9 +552,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ ) \ log_uno_uno \ unsafe_uno_uno \ - $(if $(filter MSC,$(COM)), \ - $(if $(filter INTEL,$(CPUNAME)),msci, \ - $(if $(filter AARCH64,$(CPUNAME)),msca,mscx)),gcc3)_uno \ + $(if $(filter EMSCRIPTEN,$(OS)),, \ + $(if $(filter MSC,$(COM)), \ + $(if $(filter INTEL,$(CPUNAME)),msci_uno) \ + $(if $(filter X86_64,$(CPUNAME)),mscx_uno) \ + $(if $(filter AARCH64,$(CPUNAME)),msca_uno) \ + , gcc3_uno) \ + ) \ )) $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \ |