From 43c7686b4d6afc56d2909c1630ea2eee626490bb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 17 Dec 2017 19:16:10 +0100
Subject: allow to build static gdb/strace with static/shared mixed toolchain

---
 mk/pkg-bottom.mk | 2 +-
 mk/vars.mk       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 21e8abed2..2b4957266 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -19,7 +19,7 @@ endif
 ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y)
 CONFIGURE_LIB:=--enable-static --disable-shared
 endif
-ifeq ($(ADK_TARGET_USE_SHARED_AND_STATIC_LIBS),y)
+ifeq ($(ADK_TARGET_USE_SHARED_AND_STATIC_LIBS)$(ADK_TARGET_USE_STATIC_AND_SHARED_LIBS),y)
 CONFIGURE_LIB:=--enable-static --enable-shared
 endif
 
diff --git a/mk/vars.mk b/mk/vars.mk
index 6c2a813b1..bd4b2442a 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -201,7 +201,7 @@ TARGET_LDFLAGS+=	-Wl,--secure-plt
 endif
 endif
 
-ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y)
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY)$(ADK_TARGET_USE_STATIC_AND_SHARED_LIBS),y)
 TARGET_CFLAGS+=		-static
 TARGET_CXXFLAGS+=	-static
 TARGET_LDFLAGS+=	-static
-- 
cgit v1.2.3