projects
/
openwrt
/
staging
/
chunkeey.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 5.10 to 5.10.90
[openwrt/staging/chunkeey.git]
/
include
/
toplevel.mk
diff --git
a/include/toplevel.mk
b/include/toplevel.mk
index 4003b4824182bf7d3f4243e68c3d4da806d4fc76..f5a2593a105c5bd2cec238c81f33d9f096525fa6 100644
(file)
--- a/
include/toplevel.mk
+++ b/
include/toplevel.mk
@@
-1,14
+1,10
@@
-# Makefile for OpenWrt
-#
-# Copyright (C) 2007-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# SPDX-License-Identifier: GPL-2.0-only
#
#
+# Copyright (C) 2007-2020 OpenWrt.org
PREP_MK= OPENWRT_BUILD= QUIET=0
PREP_MK= OPENWRT_BUILD= QUIET=0
-export IS_TTY=$(
shell tty -s && echo 1 || echo
0)
+export IS_TTY=$(
if $(MAKE_TERMOUT),1,
0)
include $(TOPDIR)/include/verbose.mk
include $(TOPDIR)/include/verbose.mk
@@
-19,7
+15,6
@@
else
SOURCE_DATE_EPOCH:=$(shell $(TOPDIR)/scripts/get_source_date_epoch.sh)
endif
SOURCE_DATE_EPOCH:=$(shell $(TOPDIR)/scripts/get_source_date_epoch.sh)
endif
-HOSTCC ?= $(CC)
export REVISION
export SOURCE_DATE_EPOCH
export GIT_CONFIG_PARAMETERS='core.autocrlf=false'
export REVISION
export SOURCE_DATE_EPOCH
export GIT_CONFIG_PARAMETERS='core.autocrlf=false'
@@
-59,13
+54,6
@@
export PATH:=$(path)
unexport TAR_OPTIONS
unexport TAR_OPTIONS
-ifneq ($(shell $(HOSTCC) 2>&1 | grep clang),)
- export HOSTCC_REAL?=$(HOSTCC)
- export HOSTCC_WRAPPER:=$(TOPDIR)/scripts/clang-gcc-wrapper
-else
- export HOSTCC_WRAPPER:=$(HOSTCC)
-endif
-
ifeq ($(FORCE),)
.config scripts/config/conf scripts/config/mconf: staging_dir/host/.prereq-build
endif
ifeq ($(FORCE),)
.config scripts/config/conf scripts/config/mconf: staging_dir/host/.prereq-build
endif
@@
-115,7
+103,7
@@
endif
scripts/config/%onf: CFLAGS+= -O2
scripts/config/%onf:
@$(_SINGLE)$(SUBMAKE) $(if $(findstring s,$(OPENWRT_VERBOSE)),,-s) \
scripts/config/%onf: CFLAGS+= -O2
scripts/config/%onf:
@$(_SINGLE)$(SUBMAKE) $(if $(findstring s,$(OPENWRT_VERBOSE)),,-s) \
- -C scripts/config $(notdir $@)
CC="$(HOSTCC_WRAPPER)"
+ -C scripts/config $(notdir $@)
$(eval $(call rdep,scripts/config,scripts/config/mconf))
$(eval $(call rdep,scripts/config,scripts/config/mconf))
@@
-269,8
+257,8
@@
package/symlinks-clean:
help:
cat README.md
help:
cat README.md
-distclean:
cacheclean
- rm -rf bin build_dir .c
onfig* dl feeds key-build* logs package/feeds package/openwrt-package
s staging_dir tmp
+distclean:
+ rm -rf bin build_dir .c
cache .config* dl feeds key-build* logs package/feed
s staging_dir tmp
@$(_SINGLE)$(SUBMAKE) -C scripts/config clean
ifeq ($(findstring v,$(DEBUG)),)
@$(_SINGLE)$(SUBMAKE) -C scripts/config clean
ifeq ($(findstring v,$(DEBUG)),)