diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
| commit | 2c8917958da115704507aab835c41c1a4a63664d (patch) | |
| tree | e79c26b6347e2ae8444bcdbce1236cc48f63107e /package/libthread_db/Makefile | |
| parent | cf5ef7c683fa845a6e6412b319e0a1040aa0f445 (diff) | |
| parent | cd83ced050a5d68c922a0de054ac022cd4ff26ac (diff) | |
resolve conflict
Diffstat (limited to 'package/libthread_db/Makefile')
| -rw-r--r-- | package/libthread_db/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile index aa37c78b1..394830998 100644 --- a/package/libthread_db/Makefile +++ b/package/libthread_db/Makefile @@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk ifeq ($(ADK_TARGET_LIB_GLIBC),y) include ${TOPDIR}/toolchain/glibc/Makefile.inc -else +endif ifeq ($(ADK_TARGET_LIB_EGLIBC),y) include ${TOPDIR}/toolchain/eglibc/Makefile.inc -else -include ${TOPDIR}/toolchain/uClibc/Makefile.inc endif +ifeq ($(ADK_TARGET_LIB_UCLIBC),y) +include ${TOPDIR}/toolchain/uClibc/Makefile.inc endif PKG_NAME:= libthread-db @@ -28,7 +28,9 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-install: +ifeq ($(ADK_NATIVE),) ${INSTALL_DIR} ${IDIR_LIBTHREAD_DB}/lib ${CP} ${STAGING_TARGET_DIR}/lib/libthread_db*.so* ${IDIR_LIBTHREAD_DB}/lib +endif include ${TOPDIR}/mk/pkg-bottom.mk |