summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-06 22:36:42 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-06 22:36:42 +0000
commit9135a7a4fa42dda1f3c1d9015b06a43f59c6b001 (patch)
tree4c1769568c2f1146c9bf4f32341e85a95a080f0e
parent2d640106981341b1ce9642f7b2e5d611528bdc78 (diff)
base-files: fix Build/Compile override handling, fixes ar7 compile
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25911 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1d1a07fb2..61296b05e 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -324,9 +324,6 @@ define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
endef
-define Build/Compile/Default
-endef
-
LIBGCC_A=$(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc_pic.a)
LIBGCC_MAP=$(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.map)
BUILD_LIBGCC:=$(if $(CONFIG_avr32)$(CONFIG_m68k),,$(PKG_BUILD_DIR)/libgcc_s.so.*)
@@ -375,11 +372,11 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
endif
endif
-define Build/Compile
- $(call Build/Compile/Default)
+define Build/Compile/Default
$(call Build/Compile/libgcc)
$(call Build/Compile/$(LIBC))
endef
+Build/Compile = $(Build/Compile/Default)
define Package/base-files/install
$(CP) ./files/* $(1)/