solenv/gbuild/partial_build.mk | 2 --
1 file changed, 2 deletions(-)
New commits:
commit bbc5bd1a5fca98e952177e0514c7c17f95ed2083
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Dec 20 10:28:32 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Dec 20 12:16:23 2022 +0000
make inclusion of config_host.mk unconditional
to get make vcl.build not to error with
core/solenv/gbuild/LinkTarget.mk:932: *** used LinkTarget
StaticLibrary/libzlib.a not defined. Stop.
make: *** [Makefile:121: vcl.build] Error 2
since:
commit b688b779ba20a4bec653808a42fe88cfac851029
Date: Fri Dec 16 18:41:13 2022 +0100
keep environment clear of SYSTEM_FOO vars
Change-Id: I14c3b09ad8e2ce97066995ed63d67243b8ca4a0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144586
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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
