summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-12-05 16:24:29 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-12-05 20:09:02 +0100
commita64a41e8bd33a84156daf34b2f3b7f40cbc99b26 (patch)
treec52eb4135b9ae6e5b9b75726507a5b32a09d14ac
parentcba21368d8297e4039c907ff847a3074ece09599 (diff)
don't build lockfile if using external LOCKFILE
Change-Id: I99f1f6c95f11a2d8f7b57b20965a35066bb1bbee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126381 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--solenv/Module_solenv.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index bbe6b5a97f32..1697044ae3c4 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -12,8 +12,13 @@ $(eval $(call gb_Module_Module,solenv))
$(eval $(call gb_Module_add_targets_for_build,solenv,\
Executable_concat-deps \
Executable_gbuildtojson \
+))
+
+ifneq (,$(LOCKFILE))
+$(eval $(call gb_Module_add_targets_for_build,solenv,\
$(if $(filter-out ANDROID MACOSX iOS WNT,$(OS)),Executable_lockfile) \
))
+endif
ifeq ($(COM),MSC)
$(eval $(call gb_Module_add_targets,solenv,\