From dec68c6684298cbcb793651f1221f842efd794e3 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 29 Sep 2012 17:47:33 +0200 Subject: the build tools need to know executable extension Change-Id: I44479648dd75142864503650494fb2e3f95fe719 --- solenv/gbuild/gbuild.mk | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'solenv') diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 74b0368ec209..4afc09530edf 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -171,6 +171,18 @@ include $(SRCDIR)/Repository.mk include $(SRCDIR)/RepositoryExternal.mk $(eval $(call gb_Helper_collect_libtargets)) +gb_Library_DLLPOSTFIX := lo + +# 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 + # Set up build tools that can be either internal or system. It is # necessary to do it before we start including gbuild class makefiles, # so the classes can add dependencies on them. @@ -217,18 +229,6 @@ else gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) endif -gb_Library_DLLPOSTFIX := lo - -# 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 - include $(GBUILDDIR)/Tempfile.mk include $(SRCDIR)/RepositoryFixes.mk -- cgit