diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-21 21:28:00 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-21 21:28:00 +0100 |
| commit | 3e9ad2447b2abd3220b272468d31f903279d22f2 (patch) | |
| tree | a96725dce9de06f2626b9f384ee92443ed84b1a0 | |
| parent | 4c6bf028232ee5165f55622e123bba3b9fdb77a4 (diff) | |
| download | embtoolkit-3e9ad2447b2abd3220b272468d31f903279d22f2.tar.gz embtoolkit-3e9ad2447b2abd3220b272468d31f903279d22f2.tar.bz2 embtoolkit-3e9ad2447b2abd3220b272468d31f903279d22f2.tar.xz | |
Move commit 4c6bf028232ee51 workaround to gtest makefile
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | mk/toolchain.mk | 7 | ||||
| -rw-r--r-- | packages/development/gtest/gtest.mk | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/mk/toolchain.mk b/mk/toolchain.mk index f390aed..cd9949d 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -78,13 +78,6 @@ __clang_cflags := -Qunused-arguments -fcolor-diagnostics __TARGET_CFLAGS += $(if $(CONFIG_EMBTK_LLVM_ONLY_TOOLCHAIN),$(__clang_cflags)) __TARGET_CFLAGS += $(if $(CONFIG_EMBTK_LLVM_DEFAULT_TOOLCHAIN),$(__clang_cflags)) -# -# FIXME: remove this when c++ exceptions handling fully supported in ARM -# -ifeq ($(TARGETCXX),$(TARGETGCXX)) -__TARGET_CFLAGS := $(filter-out $(__clang_cflags),$(__TARGET_CFLAGS)) -endif - TARGET_CFLAGS := $(strip $(__TARGET_CFLAGS)) TARGET_CXXFLAGS := $(filter-out $(__clang_cflags),$(TARGET_CFLAGS)) CROSS_COMPILE := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)- diff --git a/packages/development/gtest/gtest.mk b/packages/development/gtest/gtest.mk index fbdf4e1..17ea5e8 100644 --- a/packages/development/gtest/gtest.mk +++ b/packages/development/gtest/gtest.mk @@ -32,6 +32,12 @@ GTEST_BUILD_DIR := $(embtk_pkgb)/gtest-$(GTEST_VERSION) GTEST_EMBTK_DIR := $(EMBTK_ROOT)/packages/development/gtest __embtk_gtest_cflags := $(TARGET_CFLAGS) +# +# FIXME: remove this when c++ exceptions handling fully supported in ARM +# +ifeq ($(TARGETCXX),$(TARGETGCXX)) +__embtk_gtest_cflags := $(filter-out $(__clang_cflags),$(__embtk_gtest_cflags)) +endif GTEST_MAKE_OPTS := CC="$(TARGETCC)" CXX="$(TARGETCXX)" GTEST_MAKE_OPTS += CFLAGS="$(__embtk_gtest_cflags)" LIBDIR="$(LIBDIR)" |