projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
33452f9
)
[buildroot] rules.mk: properly populate $(LIBGCC_S) for external toolchains
author
Jo-Philipp Wich
<jow@openwrt.org>
Mon, 11 Apr 2011 16:06:46 +0000
(16:06 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Mon, 11 Apr 2011 16:06:46 +0000
(16:06 +0000)
SVN-Revision: 26593
rules.mk
patch
|
blob
|
history
diff --git
a/rules.mk
b/rules.mk
index a3516a57a024e7c084c768c35d1ca1f38830386d..7be2d6195d99afc1ad96b1ecc39972dbd1b8ad17 100644
(file)
--- 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
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))
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
ifdef CONFIG_USE_UCLIBC
LIBRPC=-lrpc
endif