diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-05-08 18:40:03 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-05-08 18:40:03 +0200 |
| commit | ff0209826a3a64231092f2a52b45010c3c00eac8 (patch) | |
| tree | ed9b833755296fe18739853f142be64f4cf41f0b /core/mk/pkg-macros | |
| parent | 1ad4c371b3bb486983f59d174ac65453793db802 (diff) | |
| download | embtoolkit-ff0209826a3a64231092f2a52b45010c3c00eac8.tar.gz embtoolkit-ff0209826a3a64231092f2a52b45010c3c00eac8.tar.bz2 embtoolkit-ff0209826a3a64231092f2a52b45010c3c00eac8.tar.xz | |
Build system: give ability to compile without ccache through CONFIG_EMBTK_{PKGNAME}_NOCCACHE
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'core/mk/pkg-macros')
| -rw-r--r-- | core/mk/pkg-macros/configure.mk | 11 | ||||
| -rw-r--r-- | core/mk/pkg-macros/vars.mk | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/core/mk/pkg-macros/configure.mk b/core/mk/pkg-macros/configure.mk index b6f095b..1485d5f 100644 --- a/core/mk/pkg-macros/configure.mk +++ b/core/mk/pkg-macros/configure.mk @@ -67,6 +67,9 @@ endef __embtk_pkg_ildflags = -L$(embtk_sysroot)/$(LIBDIR) __embtk_pkg_ildflags += -L$(embtk_sysroot)/usr/$(LIBDIR) +__embtk_pkg_cc = CC=$(if $(__embtk_pkg_noccache),$(TARGETCC),$(TARGETCC_CACHED)) +___embtk_pkg_cxx = CXX=$(if $(__embtk_pkg_noccache),$(TARGETCXX_CACHED),$(TARGETCXX_CACHED)) +__embtk_pkg_cxx = $(if $(CONFIG_EMBTK_GCC_LANGUAGE_CPP),$(___embtk_pkg_cxx)) define embtk_configure_pkg $(if $(EMBTK_BUILDSYS_DEBUG), $(call embtk_pinfo,"Configure $(__embtk_pkg_package)...")) @@ -75,8 +78,8 @@ define embtk_configure_pkg $(call __embtk_print_configure_opts,$(__embtk_pkg_configureopts)) $(if $(CONFIG_EMBTK_CLIB_MUSL),$(call __embtk_fixgconfigsfor_pkg,$(1))) $(Q)cd $(__embtk_pkg_builddir); \ - CC=$(TARGETCC_CACHED) \ - $(if $(CONFIG_EMBTK_GCC_LANGUAGE_CPP),CXX=$(TARGETCXX_CACHED)) \ + $(__embtk_pkg_cc) \ + $(__embtk_pkg_cxx) \ AR=$(TARGETAR) \ RANLIB=$(TARGETRANLIB) \ AS=$(CROSS_COMPILE)as \ @@ -129,8 +132,8 @@ define embtk_configure_hostpkg LDFLAGS="$(__embtk_hostpkg_ldflags)" \ PKG_CONFIG="$(PKGCONFIG_BIN)" \ PKG_CONFIG_PATH="$(EMBTK_HOST_PKG_CONFIG_PATH)" \ - $(if $(call __embtk_streq,$(PKGV),CCACHE_HOST),,CC=$(HOSTCC_CACHED)) \ - $(if $(call __embtk_streq,$(PKGV),CCACHE_HOST),,CXX=$(HOSTCXX_CACHED)) \ + $(if $(__embtk_pkg_noccache),,CC=$(HOSTCC_CACHED)) \ + $(if $(__embtk_pkg_noccache),,CXX=$(HOSTCXX_CACHED)) \ CONFIG_SHELL=$(CONFIG_EMBTK_SHELL) \ $(__embtk_pkg_configureenv) \ $(CONFIG_EMBTK_SHELL) $(__embtk_pkg_srcdir)/configure \ diff --git a/core/mk/pkg-macros/vars.mk b/core/mk/pkg-macros/vars.mk index 24cfd02..f690868 100644 --- a/core/mk/pkg-macros/vars.mk +++ b/core/mk/pkg-macros/vars.mk @@ -120,7 +120,7 @@ __embtk_pkg_cflags = $(strip $($(PKGV)_CFLAGS)) __embtk_pkg_cppflags = $(strip $($(PKGV)_CPPFLAGS)) __embtk_pkg_cxxflags = $(strip $($(PKGV)_CXXFLAGS)) __embtk_pkg_ldflags = $(strip $($(PKGV)_LDFLAGS)) - +__embtk_pkg_noccache = $(CONFIG_EMBTK_$(PKGV)_NOCCACHE) __embtk_pkg_makedirs = $(strip $($(PKGV)_MAKE_DIRS)) __embtk_pkg_makeenv = $(strip $($(PKGV)_MAKE_ENV)) __embtk_pkg_makeopts = $(strip $($(PKGV)_MAKE_OPTS)) |