From 43c7686b4d6afc56d2909c1630ea2eee626490bb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 17 Dec 2017 19:16:10 +0100 Subject: allow to build static gdb/strace with static/shared mixed toolchain --- toolchain/gcc/Makefile | 3 +++ toolchain/uclibc-ng/Makefile | 5 +++++ 2 files changed, 8 insertions(+) (limited to 'toolchain') diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 095e6649a..929cf8a79 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -21,6 +21,9 @@ TARGET_CFLAGS:= $(filter-out -msep-data,$(TARGET_CFLAGS)) TARGET_CXXFLAGS:= $(filter-out -msep-data,$(TARGET_CXXFLAGS)) endif +TARGET_CFLAGS:= $(filter-out -static,$(TARGET_CFLAGS)) +TARGET_CXXFLAGS:= $(filter-out -static,$(TARGET_CXXFLAGS)) + GCC_CONFOPTS:= --prefix=$(TOOLCHAIN_DIR)/usr \ --with-bugurl="http://www.openadk.org/" \ --build=$(GNU_HOST_NAME) \ diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index 3d07abac0..a31f4e3af 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -16,6 +16,11 @@ TARGET_LDFLAGS:=$(filter-out -fstack-protector-all,$(TARGET_LDFLAGS)) # don't use fast-math for C library TARGET_CFLAGS:= $(filter-out -ffast-math,$(TARGET_CFLAGS)) +ifeq ($(ADK_TARGET_USE_STATIC_AND_SHARED_LIBS),y) +TARGET_CFLAGS:= $(filter-out -static,$(TARGET_CFLAGS)) +TARGET_LDFLAGS:=$(filter-out -static,$(TARGET_LDFLAGS)) +endif + ifeq ($(ADK_BUILD_COMPILER_GCC),y) ifeq ($(ADK_TARGET_HARD_FLOAT),y) ifeq ($(ADK_TARGET_HARD_FLOAT_SP),y) -- cgit v1.2.3