diff options
| -rw-r--r-- | mk/macros.packages.mk | 2 | ||||
| -rw-r--r-- | mk/toolchain.mk | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index eb55e66..5d1108b 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -312,7 +312,7 @@ define embtk_configure_pkg OBJDUMP=$(TARGETOBJDUMP) \ OBJCOPY=$(TARGETOBJCOPY) \ CFLAGS="$(TARGET_CFLAGS)" \ - CXXFLAGS="$(TARGET_CFLAGS)" \ + CXXFLAGS="$(TARGET_CXXFLAGS)" \ LDFLAGS="-L$(embtk_sysroot)/$(LIBDIR) -L$(embtk_sysroot)/usr/$(LIBDIR)" \ CPPFLAGS="-I$(embtk_sysroot)/usr/include" \ PKG_CONFIG="$(PKGCONFIG_BIN)" \ diff --git a/mk/toolchain.mk b/mk/toolchain.mk index 8f29f4a..4b88eb9 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -37,7 +37,10 @@ __TARGETCXX-$(CONFIG_EMBTK_GCC_DEFAULT_TOOLCHAIN) := $(TARGETGCXX) __TARGETCC-$(CONFIG_EMBTK_LLVM_ONLY_TOOLCHAIN) := $(TARGETCLANG) __TARGETCC-$(CONFIG_EMBTK_LLVM_DEFAULT_TOOLCHAIN) := $(TARGETCLANG) -# FIXME: remove this when clang++ will support exception in c++ +# +# FIXME: remove this when clang++ will support exceptions in c++ for arm, +# as exceptions seem to work for mips. +# __TARGETCXX-$(CONFIG_EMBTK_LLVM_ONLY_TOOLCHAIN) := $(TARGETGCXX) __TARGETCXX-$(CONFIG_EMBTK_LLVM_DEFAULT_TOOLCHAIN) := $(TARGETGCXX) #__TARGETCXX-$(CONFIG_EMBTK_LLVM_ONLY_TOOLCHAIN) := $(TARGETCLANGXX) @@ -73,6 +76,7 @@ __TARGET_CFLAGS += $(if $(CONFIG_EMBTK_LLVM_ONLY_TOOLCHAIN),$(__clang_cflags)) __TARGET_CFLAGS += $(if $(CONFIG_EMBTK_LLVM_DEFAULT_TOOLCHAIN),$(__clang_cflags)) TARGET_CFLAGS := $(strip $(__TARGET_CFLAGS)) +TARGET_CXXFLAGS := $(filter-out $(__clang_cflags),$(TARGET_CFLAGS)) CROSS_COMPILE := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)- export TARGETCC TARGETCXX TARGETAR TARGETRANLIB TARGETLD TARGETNM |