diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2013-10-10 18:31:27 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-10 17:22:04 +0000 |
| commit | c18dc12f292a504b0a6f3d402cbfee77d64a40af (patch) | |
| tree | fc3857564729c220db6487435743dc29636a4617 /RepositoryExternal.mk | |
| parent | ddac824d9c109430f5caad05ca1d84cfcd599c4f (diff) | |
fix build with --enable-win-mozab-driver
moving staticlibs to workdir broke it since
520c7dc9e8860e506145e879182ca32853617097
Instead of copying the unzipped libs to another directory,
reference them from UnpackedTarball directory instead.
Change-Id: I711cae4305c6888bd923dcb09e51416cbe363377
Reviewed-on: https://gerrit.libreoffice.org/6191
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5285bccb0380..dd0e9d2bd65d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2234,11 +2234,6 @@ $(call gb_LinkTarget_use_libraries,$(1),\ xpcom_core \ ) -$(call gb_LinkTarget_use_static_libraries,$(1),\ - embed_base_s \ - mozreg_s \ -) - $(call gb_LinkTarget_add_defs,$(1),\ -DMOZILLA_CLIENT \ -DMOZ_REFLOW_PERF \ @@ -2274,8 +2269,8 @@ $(call gb_LinkTarget_add_defs,$(1),\ endif $(call gb_LinkTarget_add_libs,$(1),\ - $(OUTDIR)/lib/embed_base_s.lib \ - $(OUTDIR)/lib/mozreg_s.lib \ + $(call gb_UnpackedTarball_get_dir,moz_lib)/embed_base_s.lib \ + $(call gb_UnpackedTarball_get_dir,moz_lib)/mozreg_s.lib \ ) endif # !GCC |