diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-11-11 10:33:24 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-11-11 10:33:24 +0100 |
| commit | 013c43114ea9b65d8af37c7c6e20b699d2345899 (patch) | |
| tree | 6de98acdb7aacef8a5fd3800cee85156b8b4a718 /mk | |
| parent | 8ba91f258307bfa0c8e8dbc7a4458ccba0ab5d10 (diff) | |
| download | embtoolkit-013c43114ea9b65d8af37c7c6e20b699d2345899.tar.gz embtoolkit-013c43114ea9b65d8af37c7c6e20b699d2345899.tar.bz2 embtoolkit-013c43114ea9b65d8af37c7c6e20b699d2345899.tar.xz | |
Build system: clang static analyzer: fix its usage beside MAKEFLAGS
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/macros.packages.mk | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index d75060c..82ed4a5 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -64,18 +64,6 @@ define embtk_pkgconfig-cflags $(PKGCONFIG_BIN) $(strip $(1)) --cflags) endef -# -# Define here which make program to use in MAKE. -# FIXME: On some systems, gnu make is named gmake (ie FreeBSD) -# -__embtk_make_cmd := make -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_env) $(__embtk_make_cmd) - #Macro to adapt libtool files (*.la) for cross compiling __ltlibdirold = libdir='\/usr\/$(LIBDIR)\(.*\)' __ltlibdirnew = libdir='$(embtk_sysroot)\/usr\/$(LIBDIR)\1' @@ -124,6 +112,9 @@ endef # # Get passed package variables prefix and set some helpers macros. # +__embtk_toolchain_use_llvm-y := $(or $(CONFIG_EMBTK_LLVM_ONLY_TOOLCHAIN),$(CONFIG_EMBTK_LLVM_DEFAULT_TOOLCHAIN)) +__embtk_toolchain_has_llvm-y := $(or $(CONFIG_EMBTK_GCC_AND_LLVM_TOOLCHAIN),$(__embtk_toolchain_use_llvm-y)) + PKGV = $(strip $(shell echo $(1) | tr a-z A-Z)) pkgv = $(strip $(shell echo $(1) | tr A-Z a-z)) __embtk_pkg_name = $(strip $($(PKGV)_NAME)) @@ -191,7 +182,20 @@ __embtk_pkg_ldflags = $(strip $($(PKGV)_LDFLAGS)) __embtk_pkg_makedirs = $(strip $($(PKGV)_MAKE_DIRS)) __embtk_pkg_makeenv = $(strip $($(PKGV)_MAKE_ENV)) __embtk_pkg_makeopts = $(strip $($(PKGV)_MAKE_OPTS)) -__embtk_pkg_scanbuild = $(if $(CONFIG_EMBTK_$(PKGV)_USE_SCANBUILD),$(TARGETSCANBUILD) -o $(__embtk_pkg_srcdir)-scanbuild-results) +__embtk_pkg_scanbuild-y = $(and $(CONFIG_EMBTK_$(PKGV)_USE_SCANBUILD),$(__embtk_toolchain_has_llvm-y)) +__embtk_pkg_scanbuild = $(if $(__embtk_pkg_scanbuild-y),$(TARGETSCANBUILD) -o $(__embtk_pkg_srcdir)-scanbuild-results) + +# +# Define here which make program to use in MAKE. +# FIXME: On some systems, gnu make is named gmake (ie FreeBSD) +# +__embtk_make_cmd := make +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_env) $(__embtk_pkg_scanbuild) $(__embtk_make_cmd) # Some embtoolkit internal files for packages @@ -399,11 +403,11 @@ endef # Various helpers macros for different steps while installing packages. # __embtk_multi_make = $(foreach builddir,$(__embtk_pkg_makedirs), \ - $(__embtk_pkg_makeenv) $(__embtk_pkg_scanbuild) \ + $(__embtk_pkg_makeenv) \ $(MAKE) -C $(__embtk_pkg_builddir)/$(builddir) \ $(J) $(__embtk_pkg_makeopts);) -__embtk_single_make = $(__embtk_pkg_makeenv) $(__embtk_pkg_scanbuild) \ +__embtk_single_make = $(__embtk_pkg_makeenv) \ $(MAKE) -C $(__embtk_pkg_builddir) \ $(J) $(__embtk_pkg_makeopts) |