From b700bbdede249dd290dc67ff2ebdaf730e3ffa6a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 1 Mar 2014 09:32:10 +0100 Subject: move target/tools to tools, use ADK_HOST_NEED variable to build a tool, when required. Add archivers to tools, remove prereq checks for them. Rename host_ dir in preparation for shared openadk source via nfs/smb from different host systems. Make some abi cleanup --- package/base-files/Makefile | 2 +- package/gcc/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'package') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 0eb3a40b3..ad09f8d3d 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -85,7 +85,7 @@ endif echo "::1 localhost" >> $(IDIR_BASE_FILES)/etc/hosts echo "127.0.1.1 $(ADK_RUNTIME_HOSTNAME)" >> $(IDIR_BASE_FILES)/etc/hosts test -z $(ADK_RUNTIME_PASSWORD) || \ - $(SED) 's,\*NP\*,'"$$(${TOPDIR}/bin/mkcrypt \ + $(SED) 's,\*NP\*,'"$$($(STAGING_HOST_DIR)/usr/bin/mkcrypt \ ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow git log -1|head -1|sed -e 's#commit ##' \ > $(IDIR_BASE_FILES)/etc/adkversion diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 4b8480342..9e043401a 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -26,13 +26,13 @@ TARGET_CFLAGS:= '' TARGET_CXXFLAGS:= $(filter-out -fstack-protector,$(TARGET_CXXFLAGS)) ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) -CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_ABI) +CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_MIPS_ABI) endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS64),y) -CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_ABI) +CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_MIPS_ABI) endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS64EL),y) -CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_ABI) +CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_MIPS_ABI) endif ifeq ($(ADK_TOOLCHAIN_GCC_SJLJ),y) -- cgit v1.2.3