summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2018-06-01 19:58:20 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2018-06-01 19:58:37 +0200
commitcd2e2a876c375dbe064cb9a5c7dc5588803c837f (patch)
tree7be61275bd085fe43f8455fd7e9da683eab3d5c2 /target
parentbc42e9e27d37fd9d8998a1a440f390e517ae90ed (diff)
c6x: fix shared toolchain building, disable multilib dirs in gcc 7.3.0
Diffstat (limited to 'target')
-rw-r--r--target/c6x/Makefile2
-rw-r--r--target/config/Config.in.libs6
2 files changed, 4 insertions, 4 deletions
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