From cd2e2a876c375dbe064cb9a5c7dc5588803c837f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 1 Jun 2018 19:58:20 +0200 Subject: c6x: fix shared toolchain building, disable multilib dirs in gcc 7.3.0 --- target/c6x/Makefile | 2 +- target/config/Config.in.libs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target') diff --git a/target/c6x/Makefile b/target/c6x/Makefile index 1f550723f..3d8f8d42b 100644 --- a/target/c6x/Makefile +++ b/target/c6x/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk include $(ADK_TOPDIR)/mk/kernel-build.mk include $(ADK_TOPDIR)/mk/image.mk -KERNEL:=$(LINUX_DIR)/arch/c6x/boot/$(ADK_TARGET_KERNEL) +KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) # target helper text ifeq ($(ADK_TARGET_FS),archive) diff --git a/target/config/Config.in.libs b/target/config/Config.in.libs index 46734c842..55af79b68 100644 --- a/target/config/Config.in.libs +++ b/target/config/Config.in.libs @@ -7,7 +7,7 @@ bool "Library support" config ADK_TARGET_USE_SHARED_LIBS_ONLY bool "Create shared libraries only and link dynamically" - depends on !ADK_TARGET_BINFMT_FLAT && !ADK_TARGET_BINFMT_DSBT + depends on !ADK_TARGET_BINFMT_FLAT config ADK_TARGET_USE_STATIC_LIBS_ONLY bool "Create static libraries only and link statically" @@ -19,10 +19,10 @@ config ADK_TARGET_USE_STATIC_LIBS_ONLY config ADK_TARGET_USE_SHARED_AND_STATIC_LIBS bool "Create shared and static libraries and link dynamically" - depends on !ADK_TARGET_BINFMT_FLAT && !ADK_TARGET_BINFMT_DSBT + depends on !ADK_TARGET_BINFMT_FLAT config ADK_TARGET_USE_STATIC_AND_SHARED_LIBS bool "Create static and shared libraries and link statically" - depends on !ADK_TARGET_BINFMT_FLAT && !ADK_TARGET_BINFMT_DSBT + depends on !ADK_TARGET_BINFMT_FLAT endchoice -- cgit v1.2.3