michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sanitycheck: don't override environment for USE_CCACHE

Browse source 
Many users set USE_CCACHE=1 in their envionment. Sanitycheck was
disregarding that and placing USE_CCACHE=0 in the generated
Makefile unless --ccache was added to the command line every time
it was invoked.

Issue: ZEP-1663
Change-Id: Id3c1379f5039d4d2f4a3ae01d2ec8d0dd216f523
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2017-02-02 13:04:57 -08:00
commit f7a6e28a3c
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/sanitycheck
View file

@ -656,7 +656,7 @@ class MakeGenerator:
""" """
MAKE_RULE_TMPL = """\t@echo sanity_test_{phase} {goal} >&2 MAKE_RULE_TMPL = """\t@echo sanity_test_{phase} {goal} >&2
\t$(MAKE) -C {directory} USE_CCACHE={use_ccache} O={outdir} V={verb} EXTRA_CFLAGS="-Werror {cflags}" EXTRA_ASMFLAGS=-Wa,--fatal-warnings EXTRA_LDFLAGS=--fatal-warnings {args} >{logfile} 2>&1 \t$(MAKE) -C {directory} O={outdir} V={verb} EXTRA_CFLAGS="-Werror {cflags}" EXTRA_ASMFLAGS=-Wa,--fatal-warnings EXTRA_LDFLAGS=--fatal-warnings {args} >{logfile} 2>&1
""" """
GOAL_FOOTER_TMPL = "\t@echo sanity_test_finished {goal} >&2\n\n" GOAL_FOOTER_TMPL = "\t@echo sanity_test_finished {goal} >&2\n\n"
@ -695,7 +695,11 @@ class MakeGenerator:
if self.deprecations: if self.deprecations:
cflags = cflags + " -Wno-deprecated-declarations" cflags = cflags + " -Wno-deprecated-declarations"
return MakeGenerator.MAKE_RULE_TMPL.format(phase=phase, goal=name, use_ccache=self.ccache,
if self.ccache:
args = args + " USE_CCACHE=1"
return MakeGenerator.MAKE_RULE_TMPL.format(phase=phase, goal=name,
outdir=outdir, cflags=cflags, outdir=outdir, cflags=cflags,
directory=workdir, verb=verb, directory=workdir, verb=verb,
args=args, logfile=logfile) args=args, logfile=logfile)