make gcc4 depend on libgcc, and disable the libgcc hack for it

[openwrt.git] / openwrt / target / linux / kernel.mk

diff --git a/openwrt/target/linux/kernel.mk b/openwrt/target/linux/kernel.mk
index 8cc22cf..5406fae 100644 (file)
--- a/openwrt/target/linux/kernel.mk
+++ b/openwrt/target/linux/kernel.mk
@@ -58,7 +58,7 @@ $(LINUX_DIR)/.modules_done:
 $(STAMP_DIR)/.linux-compile:
        @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) $(MAKE_TRACE)
        ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux $(MAKE_TRACE)
 $(STAMP_DIR)/.linux-compile:
        @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) $(MAKE_TRACE)
        ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux $(MAKE_TRACE)

-       @$(TRACE) target/linux/package/compile
+       @$(TRACE) target/linux/package-compile

        $(MAKE) -C $(TOPDIR)/target/linux/package \
                $(KPKG_MAKEOPTS) \
                compile
        $(MAKE) -C $(TOPDIR)/target/linux/package \
                $(KPKG_MAKEOPTS) \
                compile


@@ -92,7 +92,7 @@ prepare:
 compile: prepare $(STAMP_DIR)/.linux-compile
 
 install: compile
 compile: prepare $(STAMP_DIR)/.linux-compile
 
 install: compile

-       @$(TRACE) target/linux/package/install
+       @$(TRACE) target/linux/package-install

        $(MAKE) $(KPKG_MAKEOPTS) pkg-install $(MAKE_TRACE)
        $(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL) $(MAKE_TRACE)
 
        $(MAKE) $(KPKG_MAKEOPTS) pkg-install $(MAKE_TRACE)
        $(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL) $(MAKE_TRACE)
 


@@ -114,3 +114,8 @@ clean:
        rm -f $(STAMP_DIR)/.linux-compile
        rm -rf $(LINUX_BUILD_DIR)
        rm -f $(TARGETS)
        rm -f $(STAMP_DIR)/.linux-compile
        rm -rf $(LINUX_BUILD_DIR)
        rm -f $(TARGETS)

+
+package/%:
+       $(MAKE) -C $(TOPDIR)/target/linux/package \
+               $(KPKG_MAKEOPTS) \
+               $(patsubst package/%,%,$@)