[toolchain/gcc] add support for gcc 4.7.0 - thanks to acoul!

[openwrt.git] / include / toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index dee43cb..9a60139 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -1,12 +1,12 @@
 # Makefile for OpenWrt
 #
 # Makefile for OpenWrt
 #

-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2011 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 

-RELEASE:=Kamikaze
+RELEASE:=Attitude Adjustment

 PREP_MK= OPENWRT_BUILD= QUIET=0
 
 include $(TOPDIR)/include/verbose.mk
 PREP_MK= OPENWRT_BUILD= QUIET=0
 
 include $(TOPDIR)/include/verbose.mk


@@ -31,6 +31,11 @@ unexport P4PORT P4USER P4CONFIG P4CLIENT
 # prevent user defaults for quilt from interfering
 unexport QUILT_PATCHES QUILT_PATCH_OPTS
 
 # prevent user defaults for quilt from interfering
 unexport QUILT_PATCHES QUILT_PATCH_OPTS
 

+unexport C_INCLUDE_PATH
+
+# prevent distro default LPATH from interfering
+unexport LPATH
+

 # make sure that a predefined CFLAGS variable does not disturb packages
 export CFLAGS=
 
 # make sure that a predefined CFLAGS variable does not disturb packages
 export CFLAGS=
 


@@ -41,6 +46,8 @@ endif
 SCAN_COOKIE?=$(shell echo $$$$)
 export SCAN_COOKIE
 
 SCAN_COOKIE?=$(shell echo $$$$)
 export SCAN_COOKIE
 

+SUBMAKE:=umask 022; $(SUBMAKE)
+

 prepare-mk: FORCE ;
 
 prepare-tmpinfo: FORCE
 prepare-mk: FORCE ;
 
 prepare-tmpinfo: FORCE


@@ -89,9 +96,9 @@ menuconfig: scripts/config/mconf prepare-tmpinfo FORCE
 
 prepare_kernel_conf: .config FORCE
 
 
 prepare_kernel_conf: .config FORCE
 

-ifeq ($(wildcard staging_dir/host/bin/sed),)
+ifeq ($(wildcard staging_dir/host/bin/quilt),)

   prepare_kernel_conf:
   prepare_kernel_conf:

-       @+$(SUBMAKE) -r tools/sed/install
+       @+$(SUBMAKE) -r tools/quilt/install

 else
   prepare_kernel_conf: ;
 endif
 else
   prepare_kernel_conf: ;
 endif


@@ -132,6 +139,13 @@ prereq:: prepare-tmpinfo .config
 
 %::
        @+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq
 
 %::
        @+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq

+       @( \
+               cp .config tmp/.config; \
+               ./scripts/config/conf -D tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \
+               if ./scripts/kconfig.pl '>' .config tmp/.config | grep -q CONFIG; then \
+                       echo "WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!"; \
+               fi \
+       )

        @+$(SUBMAKE) -r $@
 
 help:
        @+$(SUBMAKE) -r $@
 
 help: