diff options
| author | Martin Roth <martinroth@google.com> | 2016-04-02 11:10:08 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-04-20 00:24:47 +0200 |
| commit | a53958098e3ba2701b071a3a7158200da6a2eddc (patch) | |
| tree | 25645534971eaeac90a747cf2555d39309089514 | |
| parent | 7fae59b049d4cdd784ebe1972d5d5346a087190b (diff) | |
crossgcc/Makefile.inc: Update jenkins-build-toolchain
Because the builders have the coreboot cross-compilers in their path,
the XGCCPATH variable needs to be set after building the new toolchain
before it will be used.
- Add $DEST/bin to $PATH if $DEST is set, add the default location
for toolchain builds otherwise. Because the jenkins build image puts
the tools in the path, we ca
- Add KEEP_SOURCES option to help speed up compilation (Slightly).
- Log .xcompile for verification that the right toolchain was used.
- Verify that test-toolchain passes.
Change-Id: I7c270dab94be7e8f801d527169767018a24986e4
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/14231
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
| -rw-r--r-- | util/crossgcc/Makefile.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/util/crossgcc/Makefile.inc b/util/crossgcc/Makefile.inc index 5be4c10f36..d884c7ffa2 100644 --- a/util/crossgcc/Makefile.inc +++ b/util/crossgcc/Makefile.inc @@ -69,7 +69,8 @@ endif # ifeq ($(COMPILER_OUT_OF_DATE),1) # This target controls what the jenkins builder tests jenkins-build-toolchain: - $(MAKE) crosstools clang \ - BUILDGCC_OPTIONS='-y --nocolor' + $(MAKE) crosstools clang KEEP_SOURCES=1 BUILDGCC_OPTIONS='-y --nocolor' rm -f .xcompile - $(MAKE) what-jenkins-does + PATH=$(if $(DEST),$(DEST)/bin,$(top)/util/crossgcc/xgcc/bin):$$PATH; $(MAKE) what-jenkins-does + -cat .xcompile + PATH=$(if $(DEST),$(DEST)/bin,$(top)/util/crossgcc/xgcc/bin):$$PATH; $(MAKE) test-toolchain |