strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some consistent naming cant hurt: cross-build-toolset -> cross_toolset

Browse source
This commit is contained in:
Bjoern Michaelsen 2011-11-28 19:22:48 +01:00
parent e34584e742
commit cb4dbf934a
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile.in
View file

@ -2,13 +2,7 @@
SHELL=/usr/bin/env bash
ifeq (@CROSS_COMPILING@,YES)
CROSS_TOOLSET_RULE:=cross-build-toolset
else
CROSS_TOOLSET_RULE:=
endif
.PHONY : build dev-install all cross-build-toolset install distro-pack-install clean clean-host clean-build distclean findunusedcode bootstrap
.PHONY : build dev-install all cross_toolset install distro-pack-install clean clean-host clean-build distclean findunusedcode bootstrap
define forward_to_gbuild
@GNUMAKE@ -f $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/GNUmakefile.mk \
@ -50,7 +44,7 @@ build: Makefile
dev-install: Makefile
@$(call forward_to_gbuild,$@)
cross-build-toolset:
cross_toolset:
@$(call forward_to_gbuild,$@)
clean:

6
solenv/gbuild/extensions/post_BuildplTargets.mk
View file

@ -55,13 +55,13 @@ endef
.PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install all build
smoketestoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
smoketestoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
$(call gb_BuildplTarget_command,$@)
instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
$(call gb_BuildplTarget_command,$@)
cross-build-toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
$(call gb_BuildplTarget_command,$@)
dev-install: smoketestoo_native