diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-11-28 23:37:15 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-11-29 14:21:33 +0100 |
| commit | 5ce9bf3ff3b7453fe792ce71547b991423d6280f (patch) | |
| tree | dbd8d2c6179ca10eb239ca84022ae5c97d32786a /RepositoryExternal.mk | |
| parent | 93a69d37c1dbcc7365dc0cf2493d1ca27babef2b (diff) | |
Fix Linux --without-system-cairo build
...(as I e.g. use for a max-coverage ASan build) after
e5658b209a23a17b3f89fe3eabd1e065513622f1 "WASM cairo: link static lib directly",
causing
> [LNK] Library/libvcllo.so
> clang-16: error: no such file or directory: '.../workdir/UnpackedTarball/cairo/src/.libs/libcairo.a'
> clang-16: error: no such file or directory: '.../workdir/UnpackedTarball/pixman/pixman/.libs/libpixman-1.a'
> make[1]: *** [.../vcl/Library_vcl.mk:20: .../instdir/program/libvcllo.so] Error 1
because at least on Linux external/cairo only provides dynamic libraries
Change-Id: I7a35d7f28d99664ea749be23c76e74cd5a760f62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143422
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9a0eb56b1a7b..ad8f0204cd4e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1213,8 +1213,11 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,cairo)/src/.libs/libcairo.a \ - $(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs/libpixman-1.a \ + $(if $(filter EMSCRIPTEN,$(OS)), \ + $(call gb_UnpackedTarball_get_dir,cairo)/src/.libs/libcairo.a \ + $(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs/libpixman-1.a, \ + -L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \ + -L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1) \ ) endef |