summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-12-29 14:24:00 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2014-12-29 14:24:00 -0600
commit13193ae108aa4ba929045f304dca6f1787b87c69 (patch)
treecb93c28f6d07ee71c1448c26c2a90b93b1b2e88a
parent0e3585dae500fb0a976888f5dbdf3a37769680ec (diff)
with binutils git, uClibc toolchain does compile and link successfully.
-rw-r--r--package/librt/Makefile2
-rw-r--r--target/config/Config.in.toolchain1
-rw-r--r--toolchain/binutils/Makefile1
-rw-r--r--toolchain/elf2flt/Makefile2
4 files changed, 5 insertions, 1 deletions
diff --git a/package/librt/Makefile b/package/librt/Makefile
index 0b26ee121..141735347 100644
--- a/package/librt/Makefile
+++ b/package/librt/Makefile
@@ -32,8 +32,10 @@ librt-install:
${INSTALL_DIR} ${IDIR_LIBRT}/$(ADK_TARGET_LIBC_PATH)
ifeq ($(ADK_TARGET_LIB_MUSL),)
ifeq ($(ADK_TARGET_USE_STATIC_LIBS),)
+ifeq ($(ADK_TARGET_BINFMT_FLAT),)
${CP} ${STAGING_TARGET_DIR}/lib/librt*.so* ${IDIR_LIBRT}/$(ADK_TARGET_LIBC_PATH)
endif
endif
+endif
include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain
index bff7e3d9e..670833009 100644
--- a/target/config/Config.in.toolchain
+++ b/target/config/Config.in.toolchain
@@ -78,6 +78,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_24
depends on !ADK_TARGET_ARCH_ARC
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_CRIS
+ depends on !ADK_TARGET_ARCH_M68K
config ADK_TOOLCHAIN_BINUTILS_GIT
bool "git"
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index adaf4cba6..559df4174 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -56,6 +56,7 @@ endif
--disable-dependency-tracking \
--disable-libtool-lock \
--disable-nls \
+ --disable-plugins \
--disable-werror \
--disable-install-libiberty \
${CONFOPTS} \
diff --git a/toolchain/elf2flt/Makefile b/toolchain/elf2flt/Makefile
index a42398a3e..458e6e410 100644
--- a/toolchain/elf2flt/Makefile
+++ b/toolchain/elf2flt/Makefile
@@ -6,7 +6,7 @@ include Makefile.inc
include ../rules.mk
include ${ADK_TOPDIR}/mk/buildhlp.mk
-BINUTILS_VERSION:= 2.24
+BINUTILS_VERSION:= git
$(WRKBUILD)/.headers:
$(WRKBUILD)/.configured: