aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2020-11-28 17:38:54 +0000
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2021-01-05 08:59:59 +0000
commite2180e3cbe320e757f61122de17eca5240e76e04 (patch)
tree9196a177755639fe1a088466afd3b6caa8f15f90
parent1a775a4fd0339b485f48a864e2cf9e8794bfe4cb (diff)
downloadupstream-e2180e3cbe320e757f61122de17eca5240e76e04.tar.gz
upstream-e2180e3cbe320e757f61122de17eca5240e76e04.tar.bz2
upstream-e2180e3cbe320e757f61122de17eca5240e76e04.zip
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 <ldir@darbyshire-bryant.me.uk>
-rw-r--r--include/toplevel.mk10
-rwxr-xr-xscripts/clang-gcc-wrapper12
2 files changed, 1 insertions, 21 deletions
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))
diff --git a/scripts/clang-gcc-wrapper b/scripts/clang-gcc-wrapper
deleted file mode 100755
index 9e668418a9..0000000000
--- a/scripts/clang-gcc-wrapper
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-_cc="${HOSTCC_REAL:-gcc}"
-case "$1" in
- -print-file-name=*)
- dirs="$($_cc -print-search-dirs | grep -m1 libraries | sed -e 's,:, ,' -e 's,.* =,,')"
- dirs="$dirs /usr/lib /usr/local/lib"
- find $dirs -name "${1#*=}" | head -n1
- ;;
- *)
- exec $_cc "$@"
- ;;
-esac