diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-10-21 22:57:39 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-10-21 22:57:39 +0200 |
| commit | e8d07f7f88b45c1817cd604916810cb42d4da2e5 (patch) | |
| tree | c5ed77a779339fa4be3390f2b4abbd48472e9d48 /mk/macros.packages.mk | |
| parent | 77c245d542245087192b1c618ee5fc8ee13af6b2 (diff) | |
| download | embtoolkit-e8d07f7f88b45c1817cd604916810cb42d4da2e5.tar.gz embtoolkit-e8d07f7f88b45c1817cd604916810cb42d4da2e5.tar.bz2 embtoolkit-e8d07f7f88b45c1817cd604916810cb42d4da2e5.tar.xz | |
Revert "Build system: internal macros: move __embtk_make_env variable to __embtk_x_make macros"
This reverts commit 77c245d542245087192b1c618ee5fc8ee13af6b2.
Diffstat (limited to 'mk/macros.packages.mk')
| -rw-r--r-- | mk/macros.packages.mk | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index ae8b1b3..9646d2e 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -73,8 +73,8 @@ ifeq ($(findstring bsd,$(HOST_ARCH)),bsd) __embtk_make_cmd := gmake endif -__embtk_make_env := $(if $(V),MAKEFLAGS="",MAKEFLAGS="--no-print-directory --silent") -MAKE := $(__embtk_make_cmd) +__embtk_make_env := $(if $(V),MAKEFLAGS="",MAKEFLAGS="--no-print-directory --silent") +MAKE := $(__embtk_make_env) $(__embtk_make_cmd) #Macro to adapt libtool files (*.la) for cross compiling __ltlibdirold = libdir='\/usr\/$(LIBDIR)\(.*\)' @@ -394,33 +394,32 @@ endef # Various helpers macros for different steps while installing packages. # __embtk_multi_make = $(foreach builddir,$(__embtk_pkg_makedirs), \ - $(__embtk_pkg_makeenv) $(__embtk_make_env) \ + $(__embtk_pkg_makeenv) \ $(MAKE) -C $(__embtk_pkg_builddir)/$(builddir) \ $(J) $(__embtk_pkg_makeopts);) -__embtk_single_make = $(__embtk_pkg_makeenv) $(__embtk_make_env) \ - $(MAKE) -C $(__embtk_pkg_builddir) $(J) $(__embtk_pkg_makeopts) +__embtk_single_make = $(__embtk_pkg_makeenv) $(MAKE) -C $(__embtk_pkg_builddir) \ + $(J) $(__embtk_pkg_makeopts) __embtk_multi_make_install = $(foreach builddir,$(__embtk_pkg_makedirs), \ - $(__embtk_pkg_makeenv) $(__embtk_make_env) \ - $(MAKE) -C $(__embtk_pkg_builddir)/$(builddir) \ + $(__embtk_pkg_makeenv) $(MAKE) -C $(__embtk_pkg_builddir)/$(builddir) \ $(if $(__embtk_pkg_nodestdir),, \ DESTDIR=$(embtk_sysroot)$(if $(__embtk_pkg_sysrootsuffix),/$(__embtk_pkg_sysrootsuffix))) \ $(__embtk_pkg_makeopts) install;) -__embtk_single_make_install = $(__embtk_pkg_makeenv) $(__embtk_make_env) \ +__embtk_single_make_install = $(__embtk_pkg_makeenv) \ $(MAKE) -C $(__embtk_pkg_builddir) \ $(if $(__embtk_pkg_nodestdir),, \ DESTDIR=$(embtk_sysroot)$(if $(__embtk_pkg_sysrootsuffix),/$(__embtk_pkg_sysrootsuffix))) \ $(__embtk_pkg_makeopts) install __embtk_multi_make_hostinstall = $(foreach builddir,$(__embtk_pkg_makedirs), \ - $(__embtk_pkg_makeenv) $(__embtk_make_env) \ + $(__embtk_pkg_makeenv) \ $(MAKE) -C $(__embtk_pkg_builddir)/$(builddir) \ $(if $(__embtk_pkg_destdir),DESTDIR=$(__embtk_pkg_destdir)) \ $(__embtk_pkg_makeopts) install;) -__embtk_single_make_hostinstall = $(__embtk_pkg_makeenv) $(__embtk_make_env) \ +__embtk_single_make_hostinstall = $(__embtk_pkg_makeenv) \ $(MAKE) -C $(__embtk_pkg_builddir) \ $(if $(__embtk_pkg_destdir),DESTDIR=$(__embtk_pkg_destdir)) \ $(__embtk_pkg_makeopts) install |