aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2015-03-31 22:44:12 +0200
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2015-03-31 22:44:12 +0200
commit5f374c1fe85a1da95c15a5cac217f8ab762ce6dd (patch)
treed655bb9a41052d24c544cf92c5f463510403b55d
parent3a14ea8812e8695b5205a70431d513fb905c0daf (diff)
downloaduClibc-5f374c1fe85a1da95c15a5cac217f8ab762ce6dd.tar.gz
uClibc-5f374c1fe85a1da95c15a5cac217f8ab762ce6dd.tar.bz2
buildsys: Fix setting LIBGCC
We were ending up with multiple entries in LIBGCC for recursive child make instances, avoid that. Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-rw-r--r--Rules.mak6
1 files changed, 3 insertions, 3 deletions
diff --git a/Rules.mak b/Rules.mak
index ea254f1a2..cf0c5bc8b 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -807,12 +807,12 @@ endif
ASFLAGS += $(ASFLAG_--noexecstack)
LIBGCC_CFLAGS ?= $(CFLAGS) $(CPU_CFLAGS-y)
-$(eval $(call cache-output-var,LIBGCC,$(CC) $(LIBGCC_CFLAGS) -print-libgcc-file-name))
+$(eval $(call cache-output-var,LIBGCC_A,$(CC) $(LIBGCC_CFLAGS) -print-libgcc-file-name))
$(eval $(call cache-output-var,LIBGCC_EH,$(CC) $(LIBGCC_CFLAGS) -print-file-name=libgcc_eh.a))
# with -O0 we (e.g. lockf) might end up with references to
# _Unwind_Resume, so pull in gcc_eh in this case..
-LIBGCC_DIR:=$(dir $(LIBGCC))
-LIBGCC += $(if $(DODEBUG),$(LIBGCC_EH))
+LIBGCC_DIR := $(dir $(LIBGCC_A))
+LIBGCC := $(LIBGCC_A) $(if $(DODEBUG),$(LIBGCC_EH))
# moved from libpthread/linuxthreads
ifeq ($(UCLIBC_CTOR_DTOR),y)