Merge branch 'master' of git+ssh://openadk.org/git/openadk

package/musl/Makefile

@@ -23,15 +23,26 @@ CONFIG_STYLE:=          manual
 BUILD_STYLE:=           manual
 INSTALL_STYLE:=         manual
 
+MARCH:=			$(CPU_ARCH)
+ifeq ($(CPU_ARCH),i686)
+MARCH:=			i386
+endif
+ifeq ($(CPU_ARCH),i586)
+MARCH:=			i386
+endif
+ifeq ($(CPU_ARCH),i486)
+MARCH:=			i386
+endif
+
 # do nothing, musl is already build in toolchain directory
 do-install:
 	${INSTALL_DIR} $(IDIR_MUSL)/usr/bin
 	${INSTALL_DIR} $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH)
 	$(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.so $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH)
 	(cd $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) && \
-		ln -sf libc.so ld-musl-$(CPU_ARCH).so.1)
+		ln -sf libc.so ld-musl-$(MARCH).so.1)
 	(cd $(IDIR_MUSL)/usr/bin && \
-		ln -sf ../../lib/ld-musl-$(CPU_ARCH).so.1 ldd)
+		ln -sf ../../lib/ld-musl-$(MARCH).so.1 ldd)
 	
 
 musl-dev-install:
@@ -41,7 +52,8 @@ musl-dev-install:
 		INSTALL_HDR_PATH=$(IDIR_MUSL_DEV)/usr \
 		headers_install
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \
-		install_headers
+		DESTDIR=$(IDIR_MUSL_DEV) \
+		install-headers
 	@find $(IDIR_MUSL_DEV) -name .install -exec rm {} \;
 	@find $(IDIR_MUSL_DEV) -name ..install.cmd -exec rm {} \;