[x86] fix grub installation on target images, regression caused by multi-libc support

[openwrt.git] / include / toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 906a9a1..6d46fe1 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -24,6 +24,9 @@ export REVISION
 export OPENWRTVERSION
 export IS_TTY=$(shell tty -s && echo 1 || echo 0)
 
 export OPENWRTVERSION
 export IS_TTY=$(shell tty -s && echo 1 || echo 0)
 

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

 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
 endif
 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
 endif


@@ -45,24 +48,24 @@ prepare-tmpinfo: FORCE
        touch $(TOPDIR)/tmp/.build
 
 .config: ./scripts/config/conf prepare-tmpinfo $(if $(CONFIG_HAVE_DOT_CONFIG),,FORCE)
        touch $(TOPDIR)/tmp/.build
 
 .config: ./scripts/config/conf prepare-tmpinfo $(if $(CONFIG_HAVE_DOT_CONFIG),,FORCE)

-       @+if [ \! -f .config ] || ! grep CONFIG_HAVE_DOT_CONFIG .config >/dev/null; then \
+       @+if [ \! -e .config ] || ! grep CONFIG_HAVE_DOT_CONFIG .config >/dev/null; then \

                [ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
                [ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \

-               $(NO_TRACE_MAKE) menuconfig $(PREP_MK); \
+               $(_SINGLE)$(NO_TRACE_MAKE) menuconfig $(PREP_MK); \

        fi
 
 scripts/config/mconf:
        fi
 
 scripts/config/mconf:

-       @$(SUBMAKE) -s -j1 -C scripts/config all
+       @$(_SINGLE)$(SUBMAKE) -s -C scripts/config all

 
 $(eval $(call rdep,scripts/config,scripts/config/mconf))
 
 scripts/config/conf:
 
 $(eval $(call rdep,scripts/config,scripts/config/mconf))
 
 scripts/config/conf:

-       @$(SUBMAKE) -s -j1 -C scripts/config conf
+       @$(_SINGLE)$(SUBMAKE) -s -C scripts/config conf

 
 config: scripts/config/conf prepare-tmpinfo FORCE
        $< Config.in
 
 config-clean: FORCE
 
 config: scripts/config/conf prepare-tmpinfo FORCE
        $< Config.in
 
 config-clean: FORCE

-       $(NO_TRACE_MAKE) -C scripts/config clean
+       $(_SINGLE)$(NO_TRACE_MAKE) -C scripts/config clean

 
 defconfig: scripts/config/conf prepare-tmpinfo FORCE
        touch .config
 
 defconfig: scripts/config/conf prepare-tmpinfo FORCE
        touch .config


@@ -72,16 +75,16 @@ oldconfig: scripts/config/conf prepare-tmpinfo FORCE
        $< -$(if $(CONFDEFAULT),$(CONFDEFAULT),o) Config.in
 
 menuconfig: scripts/config/mconf prepare-tmpinfo FORCE
        $< -$(if $(CONFDEFAULT),$(CONFDEFAULT),o) Config.in
 
 menuconfig: scripts/config/mconf prepare-tmpinfo FORCE

-       if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \
+       if [ \! -e .config -a -e $(HOME)/.openwrt/defconfig ]; then \

                cp $(HOME)/.openwrt/defconfig .config; \
        fi
        $< Config.in
 
 kernel_oldconfig: .config FORCE
                cp $(HOME)/.openwrt/defconfig .config; \
        fi
        $< Config.in
 
 kernel_oldconfig: .config FORCE

-       $(NO_TRACE_MAKE) -C target/linux oldconfig
+       $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux oldconfig

 
 kernel_menuconfig: .config FORCE
 
 kernel_menuconfig: .config FORCE

-       $(NO_TRACE_MAKE) -C target/linux menuconfig
+       $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux menuconfig

 
 tmp/.prereq-build: include/prereq-build.mk
        mkdir -p tmp
 
 tmp/.prereq-build: include/prereq-build.mk
        mkdir -p tmp


@@ -103,7 +106,7 @@ clean dirclean: .config
 
 prereq:: .config
        @+$(MAKE) -s tmp/.prereq-build $(PREP_MK)
 
 prereq:: .config
        @+$(MAKE) -s tmp/.prereq-build $(PREP_MK)

-       @$(NO_TRACE_MAKE) -s $@
+       @+$(NO_TRACE_MAKE) -s $@

 
 %::
        @+$(PREP_MK) $(NO_TRACE_MAKE) -s prereq
 
 %::
        @+$(PREP_MK) $(NO_TRACE_MAKE) -s prereq


@@ -113,14 +116,14 @@ help:
        cat README
 
 docs docs/compile: FORCE
        cat README
 
 docs docs/compile: FORCE

-       @$(_SINGLE)$(SUBMAKE) -j1 -C docs compile
+       @$(_SINGLE)$(SUBMAKE) -C docs compile

 
 docs/clean: FORCE
 
 docs/clean: FORCE

-       @$(_SINGLE)$(SUBMAKE) -j1 -C docs clean
+       @$(_SINGLE)$(SUBMAKE) -C docs clean

 
 distclean:
        rm -rf tmp build_dir staging_dir dl .config* feeds package/feeds package/openwrt-packages bin
 
 distclean:
        rm -rf tmp build_dir staging_dir dl .config* feeds package/feeds package/openwrt-packages bin

-       @$(_SINGLE)$(SUBMAKE) -j1 -C scripts/config clean
+       @$(_SINGLE)$(SUBMAKE) -C scripts/config clean

 
 ifeq ($(findstring v,$(DEBUG)),)
   .SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package prepare-tmpinfo
 
 ifeq ($(findstring v,$(DEBUG)),)
   .SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package prepare-tmpinfo