diff options
| author | Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org> | 2018-01-31 22:17:07 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2018-02-12 18:20:46 +0300 |
| commit | d3b7a09dbdceec170479760cacdc5898090c90de (patch) | |
| tree | 0647e5f89bca62b921d6b7b2877cb773c90ce30c | |
| parent | 16702cb5bf170d0d32cfae690176d8da23b0ad64 (diff) | |
shippable: set CXX for clang case
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
| -rw-r--r-- | .shippable.yml | 1 | ||||
| -rw-r--r-- | scripts/Dockerfile | 1 |
2 files changed, 2 insertions, 0 deletions
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++ |