From c18dc12f292a504b0a6f3d402cbfee77d64a40af Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Thu, 10 Oct 2013 18:31:27 +0200 Subject: 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 Tested-by: Michael Stahl --- RepositoryExternal.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'RepositoryExternal.mk') 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 -- cgit