mirrors/openwrt
0
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-11-23 18:05:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: drop clang wrapper

Browse Source 
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>
This commit is contained in:
Kevin Darbyshire-Bryant 2020-11-28 17:38:54 +00:00
parent 1a775a4fd0
commit e2180e3cbe
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/toplevel.mk
View File

@ -19,7 +19,6 @@ else
SOURCE_DATE_EPOCH:=$(shell $(TOPDIR)/scripts/get_source_date_epoch.sh) SOURCE_DATE_EPOCH:=$(shell $(TOPDIR)/scripts/get_source_date_epoch.sh)
endif endif
HOSTCC ?= $(CC)
export REVISION export REVISION
export SOURCE_DATE_EPOCH export SOURCE_DATE_EPOCH
export GIT_CONFIG_PARAMETERS='core.autocrlf=false' export GIT_CONFIG_PARAMETERS='core.autocrlf=false'
@ -59,13 +58,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),) ifeq ($(FORCE),)
.config scripts/config/conf scripts/config/mconf: staging_dir/host/.prereq-build .config scripts/config/conf scripts/config/mconf: staging_dir/host/.prereq-build
endif endif
@ -115,7 +107,7 @@ endif
scripts/config/%onf: CFLAGS+= -O2 scripts/config/%onf: CFLAGS+= -O2
scripts/config/%onf: scripts/config/%onf:
@$(_SINGLE)$(SUBMAKE) $(if $(findstring s,$(OPENWRT_VERBOSE)),,-s) \ @$(_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))

12
scripts/clang-gcc-wrapper
View File

@ -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