projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: finally remove layer7 filter support
[openwrt/openwrt.git]
/
include
/
toplevel.mk
diff --git
a/include/toplevel.mk
b/include/toplevel.mk
index dcde7e25969182d0e52ded150d1dba6683ae21ad..33baa86da92db66c0a502d2bc49a2fa02a656057 100644
(file)
--- a/
include/toplevel.mk
+++ b/
include/toplevel.mk
@@
-19,7
+19,7
@@
else
REVISION:=$(shell $(TOPDIR)/scripts/getver.sh)
endif
REVISION:=$(shell $(TOPDIR)/scripts/getver.sh)
endif
-HOSTCC ?=
gcc
+HOSTCC ?=
$(CC)
OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION)))
export RELEASE
export REVISION
OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION)))
export RELEASE
export REVISION
@@
-43,6
+43,8
@@
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=
+unexport TAR_OPTIONS
+
ifneq ($(shell $(HOSTCC) 2>&1 | grep clang),)
export HOSTCC_REAL?=$(HOSTCC)
export HOSTCC_WRAPPER:=$(TOPDIR)/scripts/clang-gcc-wrapper
ifneq ($(shell $(HOSTCC) 2>&1 | grep clang),)
export HOSTCC_REAL?=$(HOSTCC)
export HOSTCC_WRAPPER:=$(TOPDIR)/scripts/clang-gcc-wrapper
@@
-51,7
+53,7
@@
else
endif
ifeq ($(FORCE),)
endif
ifeq ($(FORCE),)
- .config scripts/config/conf scripts/config/mconf:
tmp
/.prereq-build
+ .config scripts/config/conf scripts/config/mconf:
staging_dir/host
/.prereq-build
endif
SCAN_COOKIE?=$(shell echo $$$$)
endif
SCAN_COOKIE?=$(shell echo $$$$)
@@
-64,6
+66,7
@@
ULIMIT_FIX=_limit=`ulimit -n`; [ "$$_limit" = "unlimited" -o "$$_limit" -ge 1024
prepare-mk: FORCE ;
prepare-tmpinfo: FORCE
prepare-mk: FORCE ;
prepare-tmpinfo: FORCE
+ @+$(MAKE) -r -s staging_dir/host/.prereq-build $(PREP_MK)
mkdir -p tmp/info
$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk $(TOPDIR)/overlay/*/*.mk" SCAN_DEPTH=5 SCAN_EXTRA=""
$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk $(TOPDIR)/include/target.mk" SCAN_DEPTH=2 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1"
mkdir -p tmp/info
$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk $(TOPDIR)/overlay/*/*.mk" SCAN_DEPTH=5 SCAN_EXTRA=""
$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk $(TOPDIR)/include/target.mk" SCAN_DEPTH=2 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1"
@@
-133,13
+136,19
@@
kernel_menuconfig: prepare_kernel_conf
kernel_nconfig: prepare_kernel_conf
$(_SINGLE)$(NO_TRACE_MAKE) -C target/linux nconfig
kernel_nconfig: prepare_kernel_conf
$(_SINGLE)$(NO_TRACE_MAKE) -C target/linux nconfig
-
tmp
/.prereq-build: include/prereq-build.mk
+
staging_dir/host
/.prereq-build: include/prereq-build.mk
mkdir -p tmp
rm -f tmp/.host.mk
@$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
echo "Prerequisite check failed. Use FORCE=1 to override."; \
false; \
}
mkdir -p tmp
rm -f tmp/.host.mk
@$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
echo "Prerequisite check failed. Use FORCE=1 to override."; \
false; \
}
+ ifneq ($(realpath $(TOPDIR)/include/prepare.mk),)
+ @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prepare.mk prepare 2>/dev/null || { \
+ echo "Preparation failed."; \
+ false; \
+ }
+ endif
touch $@
printdb: FORCE
touch $@
printdb: FORCE
@@
-152,10
+161,9
@@
download: .config FORCE
@+$(SUBMAKE) target/download
clean dirclean: .config
@+$(SUBMAKE) target/download
clean dirclean: .config
- @+$(SUBMAKE) -r $@
+ @+$(SUBMAKE) -r $@
prereq:: prepare-tmpinfo .config
prereq:: prepare-tmpinfo .config
- @+$(MAKE) -r -s tmp/.prereq-build $(PREP_MK)
@+$(NO_TRACE_MAKE) -r -s $@
ifeq ($(SDK),1)
@+$(NO_TRACE_MAKE) -r -s $@
ifeq ($(SDK),1)
@@
-194,7
+202,7
@@
distclean:
@$(_SINGLE)$(SUBMAKE) -C scripts/config clean
ifeq ($(findstring v,$(DEBUG)),)
@$(_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
+ .SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig
staging_dir/host
/.prereq-build tmp/.prereq-package prepare-tmpinfo
endif
.PHONY: help FORCE
.NOTPARALLEL:
endif
.PHONY: help FORCE
.NOTPARALLEL: