diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-17 14:52:23 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-17 14:52:23 +0200 |
| commit | 7094d77abdfe1f8e7227a7b43c3d4cc28d5e0f05 (patch) | |
| tree | 662a6ae974c76707d0592d6a983480d9e0c0b700 | |
| parent | 292a4a63f5b7920125ccab50e4924666e7883ee6 (diff) | |
| parent | 38ac5bfe885f5b97a655cb47df2e411e29950639 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/eglibc/Makefile | 2 | ||||
| -rw-r--r-- | package/glibc/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 5466ddb85..494978b0c 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -90,7 +90,7 @@ eglibc-static-install: eglibc-dev-install: ${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/lib $(IDIR_EGLIBC_DEV)/usr/lib # install linker script - -cp ./files/libc.so.$(ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so + -cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so ifeq ($(ADK_TARGET_ABI_O32),y) $(SED) "s#@@ELFFORMAT@@#elf32-tradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so endif diff --git a/package/glibc/Makefile b/package/glibc/Makefile index be5d21e46..6ca0475e5 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -54,7 +54,7 @@ endif glibc-dev-install: ${INSTALL_DIR} $(IDIR_GLIBC_DEV)/lib $(IDIR_GLIBC_DEV)/usr/lib # install linker script - -cp ./files/libc.so.$(ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so + -cp ./files/libc.so.$(CPU_ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib -for file in libc libcrypt libdl libm libresolv librt libutil; do \ |