[Libreoffice-commits] core.git: extensions/CustomTarget_so_activex_x64.mk

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Wed Aug 5 10:12:21 UTC 2020


 extensions/CustomTarget_so_activex_x64.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit da1207d721a70215c455164ca0acd536e4bb0f8c
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Aug 4 17:04:47 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Aug 5 12:11:40 2020 +0200

    Ensure cp target directory exists
    
    <https://ci.libreoffice.org/job/gerrit_windows/71710/console>
    
    > cp: cannot create regular file 'C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/CustomTarget/extensions/source/activex/SOActionsApproval.cxx': No such file or directory
    [...]
    > make[1]: *** [C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/extensions/CustomTarget_so_activex_x64.mk:22: C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/CustomTarget/extensions/source/activex/SOActionsApproval.cxx] Error 1
    
    makes it look like this has been missing all along?
    
    Change-Id: Ifa685808942f05c539950311a4d800be0894c8ea
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100122
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/extensions/CustomTarget_so_activex_x64.mk b/extensions/CustomTarget_so_activex_x64.mk
index 28a5c7d49d1d..6b1b35d94bb7 100644
--- a/extensions/CustomTarget_so_activex_x64.mk
+++ b/extensions/CustomTarget_so_activex_x64.mk
@@ -18,7 +18,8 @@ $(call gb_CustomTarget_get_target,extensions/source/activex) : \
 	$(call gb_CustomTarget_get_workdir,extensions/source/activex)/so_activex.cxx \
 
 $(call gb_CustomTarget_get_workdir,extensions/source/activex)/% : \
-		$(SRCDIR)/extensions/source/activex/%
+		$(SRCDIR)/extensions/source/activex/% \
+		| $(call gb_CustomTarget_get_workdir,extensions/source/activex)/.dir
 	cp $< $@
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:


More information about the Libreoffice-commits mailing list