From 0d5a4bd73159fc794fdb417d49ab810b26e7d059 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 31 May 2014 19:58:50 +0200 Subject: rework static linking support, works with musl/glibc, fails to boot with uclibc (qemu-x86) --- package/glibc/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'package/glibc/Makefile') diff --git a/package/glibc/Makefile b/package/glibc/Makefile index b6440e479..a74493e23 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -25,22 +25,20 @@ INSTALL_STYLE:= manual # compile nothing, glibc is already build in toolchain directory do-install: +ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y) ${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH) $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH) for file in libc libcrypt libdl libm libnsl libresolv libutil libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ done +endif ${INSTALL_DIR} $(IDIR_GLIBC)/usr/bin $(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_GLIBC)/usr/bin ${INSTALL_DIR} ${IDIR_GLIBC}/etc ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_GLIBC}/etc ${INSTALL_DATA} ./files/nsswitch.conf ${IDIR_GLIBC}/etc -glibc-static-install: - ${INSTALL_DIR} $(IDIR_GLIBC_STATIC)/usr/lib - $(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.a $(IDIR_GLIBC_STATIC)/usr/lib - glibc-dev-install: ${INSTALL_DIR} $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH) $(IDIR_GLIBC_DEV)/usr/lib # install linker script -- cgit v1.2.3