[Libreoffice-commits] .: 2 commits - filter/Configuration_filter.mk solenv/gbuild

[Tor Lillqvist]

 filter/Configuration_filter.mk |    2 +-
 solenv/gbuild/gbuild.mk        |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit fcf6c0a19f1a8cdff34e95ca0787277399a82c3c
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Sep 20 10:38:13 2011 +0300

    I don't think we need to check CROSS_COMPILING here?

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index cce0159..5143d74 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -28,7 +28,7 @@
 # possibilities for Java as FOR_BUILD variants
 
 # this if is supposed to be an AND
-ifeq ($(SOLAR_JAVA)$(CROSS_COMPILING),)
+ifeq ($(SOLAR_JAVA),)
 filter_MERGE_TARGET := $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge
 filter_MERGE := $(gb_PYTHON) $(filter_MERGE_TARGET)
 else # SOLAR_JAVA
commit 58be0d5400244196df4ff5041352e38d637c877b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Sep 20 10:37:41 2011 +0300

    Use "python" as (build-time) gb_PYTHON if run-time Python usage is disabled

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 68a9d2d..88a1588 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -338,6 +338,9 @@ else ifeq ($(OS),MACOSX)
 #dirs for in-tree internal python
 gb_PYTHONTARGET :=
 gb_PYTHON := $(PYTHON)
+else ifeq ($(DISABLE_PYTHON),TRUE)
+# Build-time python
+gb_PYTHON := python
 else
 gb_PYTHONTARGET := $(OUTDIR)/bin/python
 gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET)