diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
commit | f6c5a79972bcd216429484eb706fc47c7bb52a75 (patch) | |
tree | 4f5e17701c66df5d2359486687f1fd41b2fb469e /package/libpthread/Makefile | |
parent | 00fa581bc6acc3158b3008019e81802a5d70418c (diff) | |
parent | b8e1fbce6811e906e7c8bd21f4e7fe1aa4881585 (diff) |
resolve merge conflict
Diffstat (limited to 'package/libpthread/Makefile')
-rw-r--r-- | package/libpthread/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index 764730c43..f6f9e5f5f 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -6,9 +6,6 @@ include ${TOPDIR}/rules.mk ifeq ($(ADK_TARGET_LIB_GLIBC),y) include ${TOPDIR}/toolchain/glibc/Makefile.inc endif -ifeq ($(ADK_TARGET_LIB_EGLIBC),y) -include ${TOPDIR}/toolchain/eglibc/Makefile.inc -endif ifeq ($(ADK_TARGET_LIB_MUSL),y) include ${TOPDIR}/toolchain/musl/Makefile.inc endif |