From a66b4960011df6d91b29f5f2b7f4831369e6859d Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 11 Apr 2011 16:06:46 +0000 Subject: [PATCH] rules.mk: properly populate $(LIBGCC_S) for external toolchains SVN-Revision: 26593 --- rules.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rules.mk b/rules.mk index a3516a57a0..7be2d6195d 100644 --- a/rules.mk +++ b/rules.mk @@ -110,7 +110,12 @@ TARGET_PATH:=$(STAGING_DIR_HOST)/bin:$(PATH) TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)$(if $(CONFIG_DEBUG), -g3) TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib +ifneq ($(CONFIG_EXTERNAL_TOOLCHAIN),) +LIBGCC_S_PATH=$(realpath $(wildcard $(call qstrip,$(CONFIG_LIBGCC_ROOT_DIR))/$(call qstrip,$(CONFIG_LIBGCC_FILE_SPEC)))) +LIBGCC_S=$(if $(LIBGCC_S_PATH),-L$(dir $(LIBGCC_S_PATH)) -lgcc_s) +else LIBGCC_S=$(if $(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so),-L$(TOOLCHAIN_DIR)/lib -lgcc_s,$(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.a)) +endif ifdef CONFIG_USE_UCLIBC LIBRPC=-lrpc endif