diff options
| -rw-r--r-- | solenv/gbuild/gbuild_simple.mk | 7 | ||||
| -rw-r--r-- | unoil/javamaker/Makefile | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk index b05cb8c8195c..6ee9e09f4034 100644 --- a/solenv/gbuild/gbuild_simple.mk +++ b/solenv/gbuild/gbuild_simple.mk @@ -82,6 +82,13 @@ include $(GBUILDDIR)/Tempfile.mk # Include platform/cpu/compiler specific config/definitions include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk +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 + ifeq ($(SYSTEM_PYTHON),YES) gb_PYTHONTARGET := gb_PYTHON := $(PYTHON) diff --git a/unoil/javamaker/Makefile b/unoil/javamaker/Makefile index 1086c106288a..f2391564b0e3 100644 --- a/unoil/javamaker/Makefile +++ b/unoil/javamaker/Makefile @@ -28,7 +28,7 @@ gb_PARTIALBUILD := T include $(GBUILDDIR)/gbuild_simple.mk -done : +done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) $(call gb_Helper_abbreviate_dirs_native, \ $(call gb_Helper_execute,javamaker -BUCR -O. $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \ touch $@) |