diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2015-03-01 12:49:20 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2015-03-01 13:30:01 +0100 |
| commit | 74234661a61b9d34a46e0e6d20012489090a08d7 (patch) | |
| tree | 414dce9ca6373f189a2f1187982673974287437c /core | |
| parent | 31531ca8fbff77cf8855e03049e797d7a3277709 (diff) | |
| download | embtoolkit-74234661a61b9d34a46e0e6d20012489090a08d7.tar.gz embtoolkit-74234661a61b9d34a46e0e6d20012489090a08d7.tar.bz2 embtoolkit-74234661a61b9d34a46e0e6d20012489090a08d7.tar.xz | |
Toolchain: musl: update to v1.1.6
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/kconfig/musl.kconfig | 8 | ||||
| -rw-r--r-- | core/mk/musl.mk | 13 |
2 files changed, 17 insertions, 4 deletions
diff --git a/core/kconfig/musl.kconfig b/core/kconfig/musl.kconfig index 776d248..b12bc55 100644 --- a/core/kconfig/musl.kconfig +++ b/core/kconfig/musl.kconfig @@ -33,8 +33,8 @@ choice help Which musl version to use. - config EMBTK_MUSL_VERSION_1_1_5 - bool "musl-1.1.5" + config EMBTK_MUSL_VERSION_1_1_6 + bool "musl-1.1.6" select EMBTK_MUSL_NEED_PATCH config EMBTK_MUSL_VERSION_GIT bool "Use musl git" @@ -44,10 +44,10 @@ endchoice config EMBTK_MUSL_VERSION_STRING string - default "1.1.5" if EMBTK_MUSL_VERSION_1_1_5 + default "1.1.6" if EMBTK_MUSL_VERSION_1_1_6 default "git" if EMBTK_MUSL_VERSION_GIT -config EMBTK_MUSL_REFSPEC +config EMBTK_MUSL_CATEGORY string default "toolchain" diff --git a/core/mk/musl.mk b/core/mk/musl.mk index cd66efa..e59ad5a 100644 --- a/core/mk/musl.mk +++ b/core/mk/musl.mk @@ -37,8 +37,21 @@ __embtk_musl_v += "Cross Compiler $(embtk_targetcc_name-v) [$(embtk_host_uname)] __embtk_musl_cflags := $(TARGET_CFLAGS) __embtk_musl_cflags += $(if $(embtk_toolchain_use_llvm-y),-Wno-unknown-warning-option) +# +# musl fixup: +# 1: clang does not support -frounding-math cflag +# +define pembtk_musl_fixup + $(if $(embtk_toolchain_use_llvm-y), + configure=$(call __embtk_pkg_srcdir,musl)/configure; \ + sed -e '/tryflag[[:space:]]CFLAGS_C99FSE[[:space:]]-frounding-math/d' \ + < $$configure > $$configure.tmp; \ + mv $$configure.tmp $$configure; chmod 0755 $$configure) +endef + define embtk_beforeinstall_musl $(MAKE) -C $(MUSL_BUILD_DIR) distclean + $(pembtk_musl_fixup) cd $(MUSL_SRC_DIR); \ CC=$(TARGETCC_CACHED) \ CROSS_COMPILE="$(CROSS_COMPILE)" \ |