solenv/gbuild/gbuild.mk | 24 ++++++++++++------------ soltools/Module_soltools.mk | 14 ++++++-------- 2 files changed, 18 insertions(+), 20 deletions(-)
New commits: commit dec68c6684298cbcb793651f1221f842efd794e3 Author: David Tardon <[email protected]> Date: Sat Sep 29 17:47:33 2012 +0200 the build tools need to know executable extension Change-Id: I44479648dd75142864503650494fb2e3f95fe719 diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 74b0368..4afc095 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 commit 093fe6c5ebae2b8b63690d11ba5f3843a374ff4c Author: David Tardon <[email protected]> Date: Sat Sep 29 17:44:08 2012 +0200 fix windows build Change-Id: If71b9a162b7deca5cc032bda206a8f580292ab91 diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk index ebd855a..047e4c0 100644 --- a/soltools/Module_soltools.mk +++ b/soltools/Module_soltools.mk @@ -20,14 +20,6 @@ ifeq ($(GUI),UNX) $(eval $(call gb_Module_add_targets,soltools,\ Executable_checkdll \ )) -# -# the same as the condition outside of ifneq ($(CROSS_COMPILING),YES) -# ifeq ($(GUI)$(COM),WNTMSC) -# -else -$(eval $(call gb_Module_add_targets,soltools,\ - Package_inc \ -)) endif # UNX ifeq ($(OS)$(COM),SOLARISC52) @@ -38,4 +30,10 @@ endif # SOLARISC52 endif # CROSS_COMPILING +ifeq ($(GUI)$(COM),WNTMSC) +$(eval $(call gb_Module_add_targets,soltools,\ + Package_inc \ +)) +endif # WNTMSC + # vim:set shiftwidth=4 softtabstop=4 expandtab: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
