diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-09-06 17:39:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-09-06 17:39:49 +0200 |
| commit | d682e9708d4f15528343da454c167db898fd892a (patch) | |
| tree | b4432d0559409c6d41973b10d1b556faee429445 | |
| parent | e6231189fdd912da5f0752a38848aa32497b03e1 (diff) | |
| parent | e8b502d0d9380dc893fa136005d20f75813e3cdc (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/libgcc/Makefile | 2 | ||||
| -rw-r--r-- | package/libpthread/Makefile | 2 | ||||
| -rw-r--r-- | package/librt/Makefile | 2 | ||||
| -rw-r--r-- | target/config/Config.in.toolchain | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile index 91a5b18c1..3a974f302 100644 --- a/package/libgcc/Makefile +++ b/package/libgcc/Makefile @@ -35,6 +35,7 @@ INSTALL_STYLE:= manual libgcc-install: $(INSTALL_DIR) ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) ifeq ($(ADK_TARGET_UCLINUX),) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS),) ifeq ($(ADK_LINUX_SH),y) ifeq ($(ADK_TARGET_LIB_GLIBC),) ${CP} ${STAGING_TARGET_DIR}/lib/m4-nofpu/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) @@ -43,5 +44,6 @@ else ${CP} ${STAGING_TARGET_DIR}/lib/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) endif endif +endif include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index 13de900ff..6ba962062 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -35,10 +35,12 @@ INSTALL_STYLE:= manual libpthread-install: ifeq ($(ADK_TARGET_LIB_MUSL),) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS),) ifeq ($(ADK_TARGET_WITH_NPTL),y) ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH) ${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH) endif endif +endif include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/librt/Makefile b/package/librt/Makefile index 3408ec235..0b26ee121 100644 --- a/package/librt/Makefile +++ b/package/librt/Makefile @@ -31,7 +31,9 @@ INSTALL_STYLE:= manual librt-install: ${INSTALL_DIR} ${IDIR_LIBRT}/$(ADK_TARGET_LIBC_PATH) ifeq ($(ADK_TARGET_LIB_MUSL),) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS),) ${CP} ${STAGING_TARGET_DIR}/lib/librt*.so* ${IDIR_LIBRT}/$(ADK_TARGET_LIBC_PATH) endif +endif include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index cbdb941b4..75132ddb8 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -12,7 +12,6 @@ config ADK_VENDOR choice prompt "GCC version" -depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH config ADK_TOOLCHAIN_GCC_4_5_4 prompt "4.5.4" @@ -216,5 +215,4 @@ config ADK_UCLIBC_TEST depends on ADK_TARGET_LIB_UCLIBC_NG || ADK_TARGET_LIB_UCLIBC default y - endmenu |