[Libreoffice-commits] .: solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/TargetLocations.mk |    2 +-
 solenv/gbuild/gbuild.mk          |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 8ea05afe94c82c640418a9d543c67922a840f487
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jun 21 01:12:42 2011 +0300

    Add gb_Executable_EXT_for_build and use it
    
    Fixes native build on Windows.

diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
old mode 100755
new mode 100644
index 44f0bce..11b2b28
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -29,7 +29,7 @@
 
 gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
 gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
-gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)
+gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT_for_build)
 gb_PackagePart_get_destinations = \
 	$(OUTDIR)/xml \
 	$(OUTDIR)/pck \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 15322a3..702c7bb 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -173,6 +173,13 @@ else
 $(eval $(call gb_Output_error,Unsupported OS: $(OS)))
 endif
 
+ifeq ($(CROSS_COMPILING),YES)
+# We can safely Assume all cross-compilation is from Unix systems.
+gb_Executable_EXT_for_build :=
+else
+gb_Executable_EXT_for_build := $(gb_Executable_EXT)
+endif
+
 include $(GBUILDDIR)/Tempfile.mk
 
 include $(GBUILDDIR)/Tempfile.mk