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: b95ccd3db6eeb7358a877541747e06354429acdd ** Merge commit sha: eb9e424b83553d93732577a9ba50c59a684ca7ea **/ .shippable.yml | 1 + scripts/Dockerfile | 1 + 2 files changed, 2 insertions(+)
diff --git a/.shippable.yml b/.shippable.yml index 2469c82f2..3ab930b3f 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 CFLAGS="-O0 --coverage" CXXFLAGS="-O0 --coverage" LDFLAGS="--coverage" - make V=1 - 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 012c1a070..dc4411aa1 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -26,3 +26,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++