From e2180e3cbe320e757f61122de17eca5240e76e04 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sat, 28 Nov 2020 17:38:54 +0000 Subject: build: drop clang wrapper clang's gcc emulation does the right thing with -print-file-name now, drop the wrapper Signed-off-by: Kevin Darbyshire-Bryant --- include/toplevel.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'include/toplevel.mk') diff --git a/include/toplevel.mk b/include/toplevel.mk index 4003b48241..d3500ef58f 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -19,7 +19,6 @@ else 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' @@ -59,13 +58,6 @@ export PATH:=$(path) 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 @@ -115,7 +107,7 @@ endif 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)) -- cgit v1.2.3