WASM clarified --with-wasm-module
Option is for WASM only, so shouldn't be named --with-main-module. Also the option's default value changed since it was introduced, so the documentation became outdated. See commits:fe678ffc6f
Emscripten: No need to pass --with-main-module into build configure437b4d802c
Fix default value of Emscripten --with-main-module8aef8c3a14
Make it possible to run either Writer or Calc in the same Emscripten thing97ee126d69
WASM add Calc as optional build result, make it build & run Change-Id: I29aeeb9a840ec07e46cbf153c535b3fca9d88cd1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182798 Tested-by: Jenkins Reviewed-by: Moritz Duge <moritz.duge@allotropia.de>
This commit is contained in:
12
configure.ac
12
configure.ac
@@ -2170,11 +2170,11 @@ AC_ARG_ENABLE(wasm-strip,
|
||||
[Strip the static build like for WASM/emscripten platform.]),
|
||||
,)
|
||||
|
||||
AC_ARG_WITH(main-module,
|
||||
AS_HELP_STRING([--with-main-module=<writer/calc/impress>],
|
||||
AC_ARG_WITH(wasm-module,
|
||||
AS_HELP_STRING([--with-wasm-module=<writer/calc/impress>],
|
||||
[Specify which main module to build for wasm.
|
||||
Default value is 'writer'.]),
|
||||
, [with_main_module='calc writer'])
|
||||
Default value is 'calc writer'.]),
|
||||
, [with_wasm_module='calc writer'])
|
||||
# Don't include impress by default. Debug builds become too large for Chromium
|
||||
# with 'calc impress writer' enabled. (buffer source exceeds maximum size)
|
||||
|
||||
@@ -4178,7 +4178,7 @@ if test "$cross_compiling" = "yes"; then
|
||||
ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS=TRUE
|
||||
ENABLE_WASM_STRIP_CALC=TRUE
|
||||
ENABLE_WASM_STRIP_WRITER=TRUE
|
||||
for i in $with_main_module; do
|
||||
for i in $with_wasm_module; do
|
||||
case "$i" in
|
||||
calc)
|
||||
ENABLE_WASM_STRIP_ACCESSIBILITY=
|
||||
@@ -4192,7 +4192,7 @@ if test "$cross_compiling" = "yes"; then
|
||||
ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS=
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([Unknown --with-main-module "$i"])
|
||||
AC_MSG_ERROR([Unknown --with-wasm-module "$i"])
|
||||
esac
|
||||
done
|
||||
if test "$ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS" = TRUE; then
|
||||
|
@@ -433,7 +433,7 @@ For instance, this autogen.input works for me:
|
||||
`--disable-crashdump`
|
||||
`--host=wasm32-local-emscripten`
|
||||
`--disable-gui`
|
||||
`--with-main-module=writer`
|
||||
`--with-wasm-module=writer`
|
||||
`--with-package-format=emscripten`
|
||||
|
||||
For building LO core for use in COWASM, it is known to work to use
|
||||
|
Reference in New Issue
Block a user