diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-05-03 14:14:30 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-06-20 16:48:20 +1000 |
| commit | d4a965643ee8b8829bce401049c9f7ca92ba85e1 (patch) | |
| tree | bb8cd9bae4d25529794c83e39f71fd3b8c36f10f | |
| parent | 34d9bd113e0c6bd7f1679daf4b7e7f2c82a3854f (diff) | |
| download | skiboot-d4a965643ee8b8829bce401049c9f7ca92ba85e1.zip skiboot-d4a965643ee8b8829bce401049c9f7ca92ba85e1.tar.gz skiboot-d4a965643ee8b8829bce401049c9f7ca92ba85e1.tar.bz2 | |
gard: disable cross compile for travis
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
(cherry picked from commit 98b80af1001027cc59dce040831c1f54d41e4f88)
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | external/gard/test/Makefile.check | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 9b74f40..bb67281 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ env: script: - (cd opal-ci; ./build-qemu-powernv.sh) - ./opal-ci/fetch-debian-jessie-installer.sh - - make -j4 all check ; (make clean; cd external/gard && make) + - make -j4 all check ; (make clean; cd external/gard && CROSS= make) - (cd external/pflash; ./build-all-arch.sh) - make clean && SKIBOOT_GCOV=1 make && SKIBOOT_GCOV=1 make check - make clean && rm -rf builddir && mkdir builddir && make SRC=`pwd` -f ../Makefile -C builddir diff --git a/external/gard/test/Makefile.check b/external/gard/test/Makefile.check index ec4993a..d457361 100644 --- a/external/gard/test/Makefile.check +++ b/external/gard/test/Makefile.check @@ -7,8 +7,8 @@ check: check-gard #architectures might be lying around and clean once done to #avoid the opposite check-gard: gard-test-clean - @make CROSS_COMPILE='' -C external/gard/ check - @make CROSS_COMPILE='' -C external/gard/ clean + @make CC=$(HOSTCC) CROSS='' CROSS_COMPILE='' -C external/gard/ check + @make CC=$(HOSTCC) CROSS='' CROSS_COMPILE='' -C external/gard/ clean .PHONY: check-gard |