diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-01-15 15:04:07 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-01-15 20:56:30 +0100 |
| commit | 82633cdad36083e537886b832483f4e73263735a (patch) | |
| tree | e8816c7b81fa0e40f2d9f480aee68498a9fcfddd /solenv/gbuild | |
| parent | 39c347b2d9ffe285160e13207a4df79d0972cbce (diff) | |
gbuild: simplify gb_Helper_abbreviate_dirs*
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/Helper.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 4 |
4 files changed, 5 insertions, 10 deletions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 84e6cd975ca0..965542418f44 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -47,6 +47,10 @@ $(subst $(SRCDIR)/,$$S/,O=$(OUTDIR)) && \ $(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,W=$(WORKDIR) && $(subst $(WORKDIR)/,$$W/,$(1))))) endef +define gb_Helper_abbreviate_dirs_native +$(call gb_Helper_convert_native,$(call gb_Helper_abbreviate_dirs,$(1))) +endef + define gb_Helper_make_clean_target gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1) diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 4aa2a917dc88..e0d6f1297454 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -241,11 +241,6 @@ gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ prin gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') -define gb_Helper_abbreviate_dirs_native -R=$(gb_Helper_REPODIR_NATIVE) && $(subst $(REPODIR)/,$$R/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,O=$(gb_Helper_OUTDIR_NATIVE) && W=$(gb_Helper_WORKDIR_NATIVE) && S=$(gb_Helper_SRCDIR_NATIVE))) && \ -$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1))))))))) -endef - gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin" # convert parameters filesystem root to native notation diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 33aa9369a2da..9e055ed0e6bd 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -160,5 +160,3 @@ $(1) endef gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib - -gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs) diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index afb96297a615..c826beae46b7 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -139,8 +139,6 @@ gb_COMPILERNOOPTFLAGS := # Helper class -gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs) - gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib # $(1): list of directory pathnames to append at the end of the ld path @@ -382,7 +380,7 @@ endef # Sun cc/CC support -xM1/-xMF flags, but unfortunately refuse input files that # do not have the right suffix, so use makedepend here... define gb_SrsPartTarget__command_dep -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \ $(INCLUDE) \ $(DEFS) \ |