summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-12-17 18:16:10 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2017-12-17 18:16:10 (GMT)
commit43c7686b4d6afc56d2909c1630ea2eee626490bb (patch)
tree8f7878c63c45c757cf8b6f7ac7fac0783da6bf31 /toolchain
parent41f5fc3d3eb0b17faeed0de4ddc736c94054db80 (diff)
allow to build static gdb/strace with static/shared mixed toolchain
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/gcc/Makefile3
-rw-r--r--toolchain/uclibc-ng/Makefile5
2 files changed, 8 insertions, 0 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 095e664..929cf8a 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 3d07aba..a31f4e3 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)