From: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org>
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org>
---
/** Email created from pull request 441 (lumag:shippable-ci)
** https://github.com/Linaro/odp/pull/441
** Patch: https://github.com/Linaro/odp/pull/441.patch
** Base sha: 5865787680be13b47b777e8b0b64646755be41e0
** Merge commit sha: 01cdfba8d0a64c3f3144219f06c11740bccfda7e
**/
.shippable.yml | 1 +
scripts/Dockerfile | 1 +
2 files changed, 2 insertions(+)
diff --git a/.shippable.yml b/.shippable.yml
index a9e008439..d17319e70 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -36,6 +36,7 @@ build:
- sudo mount -t hugetlbfs nodev /mnt/huge
- mkdir -p /dev/shm/odp
- ./bootstrap
+ - if [ "${CC#clang}" != "${CC}" ] ; then export CXX="${CC/clang/clang++}";
fi
- ./configure --disable-test-perf
- make
- sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes make check -k
diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index 7e117971d..3e1d54dbd 100644
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -25,3 +25,4 @@ RUN sudo apt-get update && sudo apt-get install -yy \
RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 10
RUN sudo ln -s /usr/bin/clang-3.8 /usr/bin/clang
+RUN sudo ln -s /usr/bin/clang++-3.8 /usr/bin/clang++
