solenv/gbuild/partial_build.mk | 2 --
1 file changed, 2 deletions(-)
New commits:
commit 9182ca7c7652930265e2dcdbed953e5c6dacd222
Author: Michael Stahl <[email protected]>
AuthorDate: Wed Feb 8 11:59:43 2023 +0100
Commit: Thorsten Behrens <[email protected]>
CommitDate: Wed Feb 8 14:06:29 2023 +0000
gbuild: fix make module.clean
Make openssl.clean fails because OPENSSL_TARBALL is empty in the
sub-make that's launched in the openssl module, because it's no longer
exported, but BUILD_TYPE is still exported, so the sub-make doesn't read
download.lst itself.
Cherry-pick part of commit d9617d5529e0da23bd8602d07ce459cc42746e02 to
fix it.
Change-Id: Icabfbd4e9dd78b465943a148e702cec0a5ea3f69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146652
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <[email protected]>
diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index dc52c593f7ee..5819667b2f56 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -28,9 +28,7 @@ BUILDDIR := $(if $(wildcard
$(gb_partial_build__makefile_dir)../Module_external.
$(gb_partial_build__makefile_dir)..)
endif
-ifeq ($(BUILD_TYPE),)
include $(BUILDDIR)/config_$(gb_Side).mk
-endif
gb_PARTIAL_BUILD := T
include $(SRCDIR)/solenv/gbuild/gbuild.mk
