RepositoryExternal.mk | 9 ++------- moz/ExternalPackage_moz_lib.mk | 2 -- 2 files changed, 2 insertions(+), 9 deletions(-)
New commits: commit c18dc12f292a504b0a6f3d402cbfee77d64a40af Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Date: Thu Oct 10 18:31:27 2013 +0200 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 <mst...@redhat.com> Tested-by: Michael Stahl <mst...@redhat.com> diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5285bcc..dd0e9d2 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 diff --git a/moz/ExternalPackage_moz_lib.mk b/moz/ExternalPackage_moz_lib.mk index 85765d3..6246b21 100644 --- a/moz/ExternalPackage_moz_lib.mk +++ b/moz/ExternalPackage_moz_lib.mk @@ -10,8 +10,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,moz_lib,moz_lib)) $(eval $(call gb_ExternalPackage_add_unpacked_files,moz_lib,lib,\ - embed_base_s.lib \ - mozreg_s.lib \ nslber32v50.lib \ nsldap32v50.lib \ xpcom.lib \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits