projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade Linaro GCC 4.8 to 4.8-2013.11
[openwrt/openwrt.git]
/
include
/
toplevel.mk
diff --git
a/include/toplevel.mk
b/include/toplevel.mk
index 708228600c55a7d119fdbc8e723621b109fd2c26..23d70ac81a1d3d092ab68bbc2a3aa16644d0241d 100644
(file)
--- a/
include/toplevel.mk
+++ b/
include/toplevel.mk
@@
-43,6
+43,13
@@
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=
+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: tmp/.prereq-build
endif
ifeq ($(FORCE),)
.config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
endif
@@
-74,12
+81,12
@@
prepare-tmpinfo: FORCE
fi
scripts/config/mconf:
fi
scripts/config/mconf:
- @$(_SINGLE)$(SUBMAKE) -s -C scripts/config all CC="$(HOSTCC)"
+ @$(_SINGLE)$(SUBMAKE) -s -C scripts/config all CC="$(HOSTCC
_WRAPPER
)"
$(eval $(call rdep,scripts/config,scripts/config/mconf))
scripts/config/conf:
$(eval $(call rdep,scripts/config,scripts/config/mconf))
scripts/config/conf:
- @$(_SINGLE)$(SUBMAKE) -s -C scripts/config conf CC="$(HOSTCC)"
+ @$(_SINGLE)$(SUBMAKE) -s -C scripts/config conf CC="$(HOSTCC
_WRAPPER
)"
config: scripts/config/conf prepare-tmpinfo FORCE
$< Config.in
config: scripts/config/conf prepare-tmpinfo FORCE
$< Config.in
@@
-89,7
+96,8
@@
config-clean: FORCE
defconfig: scripts/config/conf prepare-tmpinfo FORCE
touch .config
defconfig: scripts/config/conf prepare-tmpinfo FORCE
touch .config
- $< --defconfig .config Config.in
+ @if [ -e $(HOME)/.openwrt/defconfig ]; then cp $(HOME)/.openwrt/defconfig .config; fi
+ $< --defconfig=.config Config.in
confdefault-y=allyes
confdefault-m=allmod
confdefault-y=allyes
confdefault-m=allmod
@@
-152,7
+160,7
@@
prereq:: prepare-tmpinfo .config
@+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq
@( \
cp .config tmp/.config; \
@+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq
@( \
cp .config tmp/.config; \
- ./scripts/config/conf --defconfig
tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \
+ ./scripts/config/conf --defconfig
=
tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \
if ./scripts/kconfig.pl '>' .config tmp/.config | grep -q CONFIG; then \
printf "$(_R)WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!$(_N)\n" >&2; \
fi \
if ./scripts/kconfig.pl '>' .config tmp/.config | grep -q CONFIG; then \
printf "$(_R)WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!$(_N)\n" >&2; \
fi \