diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-03-02 10:54:04 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-03-02 10:54:04 +0100 |
| commit | 6e4c08586f2b2281bbcc965f701d74d5a0800754 (patch) | |
| tree | caa4b42f9266a4116ff2312754ce738b107d7b7d /mk | |
| parent | 14d576e205e4f34096e078ee546b3bb25517de74 (diff) | |
| download | embtoolkit-6e4c08586f2b2281bbcc965f701d74d5a0800754.tar.gz embtoolkit-6e4c08586f2b2281bbcc965f701d74d5a0800754.tar.bz2 embtoolkit-6e4c08586f2b2281bbcc965f701d74d5a0800754.tar.xz | |
Toolchain: musl: fix dynamic linker symlink
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/arch/arm/arm.mk | 9 | ||||
| -rw-r--r-- | mk/arch/mips/mips.mk | 9 | ||||
| -rw-r--r-- | mk/musl.mk | 4 |
3 files changed, 20 insertions, 2 deletions
diff --git a/mk/arch/arm/arm.mk b/mk/arch/arm/arm.mk index 13674ab..f3a3e48 100644 --- a/mk/arch/arm/arm.mk +++ b/mk/arch/arm/arm.mk @@ -73,6 +73,15 @@ EMBTK_TARGET_FLOAT_CFLAGS := $(strip $(if $(CONFIG_EMBTK_SOFTFLOAT), \ EMBTK_TARGET_MCPU := -mcpu=$(EMBTK_MCU_FLAG) EMBTK_TARGET_MARCH := +# +# musl options +# +embtk_musl_dlinker := ld-musl-arm$(__embtk_arm_endian)$(if $(CONFIG_EMBTK_HARDFLOAT),hf) + +# +# misc +# + # Some cross compiler variables __xtools_env_float := $(if $(CONFIG_EMBTK_SOFTFLOAT),sf,hf) __xtools_archos := $(GNU_TARGET) diff --git a/mk/arch/mips/mips.mk b/mk/arch/mips/mips.mk index 3c80963..6914579 100644 --- a/mk/arch/mips/mips.mk +++ b/mk/arch/mips/mips.mk @@ -136,6 +136,15 @@ endif EMBTK_TARGET_MCPU := EMBTK_TARGET_MARCH := -march=$(EMBTK_MCU_FLAG) +# +# musl options +# +embtk_musl_dlinker := ld-musl-mips$(__embtk_mips_endian)$(if $(CONFIG_EMBTK_SOFTFLOAT),-sf) + +# +# misc +# + # Some cross compiler variables __xtools_archos := mips$(__embtk_mips_64bit)$(__embtk_mips_endian)-$(embtk_os) __xtools_env := $(GNU_TARGET_ARCH)$(__xtools_env_float)-$(__xtools_env_abi) @@ -57,8 +57,8 @@ define __embtk_install_musl $(Q)$(MAKE) -C $(MUSL_BUILD_DIR) \ DESTDIR=$(embtk_sysroot) install-libs install-headers cd $(embtk_sysroot)/$(LIBDIR); \ - ln -sf libc.so ld-musl-$(LINUX_ARCH).so.1; \ - ln -sf ld-musl-$(LINUX_ARCH).so.1 ld-musl.so.1 + ln -sf libc.so $(embtk_musl_dlinker).so.1; \ + ln -sf $(embtk_musl_dlinker).so.1 ld-musl.so.1 $(call __embtk_setinstalled_pkg,musl) $(call __embtk_pkg_gen_dotkconfig_f,musl) endef |