diff options
| -rw-r--r-- | mk/macros.packages.mk | 6 | ||||
| -rw-r--r-- | mk/toolchain.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index 68848f1..eaaf52b 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -112,8 +112,8 @@ 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)) +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)) @@ -182,7 +182,7 @@ __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-y = $(and $(CONFIG_EMBTK_$(PKGV)_USE_SCANBUILD),$(__embtk_toolchain_has_llvm-y)) +__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) # diff --git a/mk/toolchain.mk b/mk/toolchain.mk index 237ef3a..37ad41d 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -33,8 +33,8 @@ TARGETCLANGXX := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-clang++ __TARGETCC-y := $(TARGETGCC) __TARGETCXX-y := $(TARGETGCXX) -__TARGETCC-$(__embtk_toolchain_use_llvm-y) := $(TARGETCLANG) -__TARGETCXX-$(__embtk_toolchain_use_llvm-y) := $(TARGETCLANGXX) +__TARGETCC-$(embtk_toolchain_use_llvm-y) := $(TARGETCLANG) +__TARGETCXX-$(embtk_toolchain_use_llvm-y) := $(TARGETCLANGXX) # # FIXME: remove this when clang++ will support exceptions in c++ for arm, |