diff options
Diffstat (limited to 'package/uclibc-ng/Makefile')
| -rw-r--r-- | package/uclibc-ng/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index 765878630..c1f2215c4 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -31,6 +31,10 @@ uclibc-ng-install: -$(CP) $(STAGING_TARGET_DIR)/lib/ld*-uClibc*.so* $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) -$(CP) $(STAGING_TARGET_DIR)/lib/libc.so.* $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) -$(CP) $(STAGING_TARGET_DIR)/lib/libuClibc-*.so $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) +ifeq ($(ADK_TARGET_BINFMT_ELF)$(ADK_TARGET_WITH_MMU),y) + $(CP) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/lib/ld*-uClibc*.so* \ + $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) +endif ifeq ($(ADK_TARGET_ARCH_CSKY),y) cd $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) && \ ln -sf ld-uClibc.so.0 ld.so.1 @@ -46,17 +50,15 @@ endif uclibc-ng-dev-install: ${INSTALL_DIR} ${IDIR_UCLIBC_NG_DEV}/usr/lib ${IDIR_UCLIBC_NG_DEV}/$(ADK_TARGET_LIBC_PATH) + ${INSTALL_DIR} ${IDIR_UCLIBC_NG_DEV}/usr/include -${CP} ${STAGING_TARGET_DIR}/usr/lib/libc.so ${IDIR_UCLIBC_NG_DEV}/usr/lib -${CP} ${STAGING_TARGET_DIR}/usr/lib/uclibc_nonshared.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_UCLIBC_NG_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt*.o ${IDIR_UCLIBC_NG_DEV}/usr/lib - ${KERNEL_MAKE_ENV} \ - $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_FILE_VER)-1/linux-$(KERNEL_FILE_VER) \ - $(KERNEL_MAKE_OPTS) \ - INSTALL_HDR_PATH=$(IDIR_UCLIBC_NG_DEV)/usr \ - headers_install + ${KERNEL_MAKE} INSTALL_HDR_PATH=$(IDIR_UCLIBC_NG_DEV)/usr headers_install $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \ PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \ - DEVEL_PREFIX=/usr \ + DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \ HOSTCC="$(CC_FOR_BUILD)" \ CPU_CFLAGS="$(TARGET_CFLAGS)" \ |