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 /external/cppunit/ExternalProject_cppunit.mk | |
| parent | 013ddc4f5307df512767ca23b3922540b2b36d52 (diff) | |
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 'external/cppunit/ExternalProject_cppunit.mk')
| -rw-r--r-- | external/cppunit/ExternalProject_cppunit.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk index 1c5ac725af59..92db8a1953f3 100644 --- a/external/cppunit/ExternalProject_cppunit.mk +++ b/external/cppunit/ExternalProject_cppunit.mk @@ -43,7 +43,7 @@ endif $(call gb_ExternalProject_get_state_target,cppunit,build) : $(call gb_Trace_StartRange,cppunit,EXTERNAL) $(call gb_ExternalProject_run,build,\ - ./configure \ + $(gb_RUN_CONFIGURE) ./configure \ --disable-dependency-tracking \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ --disable-doxygen \ @@ -55,7 +55,8 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) : $(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ $(if $(filter SOLARIS,$(OS)),LIBS="-lm") \ $(if $(filter ANDROID,$(OS)),LIBS="$(gb_STDLIBS)") \ - CXXFLAGS="$(cppunit_CXXFLAGS)" \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CXXFLAGS="$(cppunit_CXXFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS)" \ && cd src \ && $(MAKE) \ ) |