diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2019-10-13 02:37:47 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2019-10-13 02:37:47 +0300 |
| commit | 17999ded479adfc2fb6417d0bb620259293377a0 (patch) | |
| tree | ba71d727fcf0c722877c51899f92971b6978f1be | |
| parent | 06e14c1b6a5835c0e08c00b4670d0c6c5343dc98 (diff) | |
Try bumping travis clang to v8 to see if it has the filesystem ts linkage.
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | CMakeLists.txt | 1 |
2 files changed, 8 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index bec3c223..20a3aed5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ dist: bionic language: cpp compiler: - g++ - - clang++ + - clang++-8 sudo: false os: - linux @@ -20,7 +20,9 @@ addons: apt: packages: - g++ - - clang + - clang-8 + - libc++-8-dev + - libc++abi-8-dev - g++-arm-linux-gnueabihf - python3 - cmake @@ -50,10 +52,10 @@ matrix: # - os: osx # env: __="cmake tests (status_code)" NAME=TravisLinuxWorkerSC CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON - os: linux - compiler: clang++ + compiler: clang++-8 env: __="ARM32 cmake tests (error_code)" NAME=Linux_ARM32_EC CMAKE_CONFIGURE_OPTIONS= - os: linux - compiler: clang++ + compiler: clang++-8 env: __="ARM32 cmake tests (status_code)" NAME=Linux_ARM32_SC CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON - os: linux compiler: g++ @@ -74,7 +76,7 @@ before_install: export CMAKE_CONFIGURE_OPTIONS="$CMAKE_CONFIGURE_OPTIONS -DCMAKE_LIBRARY_PATH=/usr/local/opt/llvm/lib"; fi - if [ "$CXX" = "g++" ]; then export NAME=GCC$NAME; fi; - - if [ "$CXX" = "clang++" ]; then export NAME=Clang$NAME; fi; + - if [ "$CXX" = "clang++-8" ]; then export NAME=Clang$NAME; fi; - git checkout develop - git submodule update --init --recursive - mount diff --git a/CMakeLists.txt b/CMakeLists.txt index 5926f56b..0f09ae18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,6 +242,7 @@ if(NOT PROJECT_IS_DEPENDENCY) if(USING_LIBCXX_ON_LINUX) if(NOT test_target MATCHES _sl) apply_cxx_coroutines_to(PRIVATE ${test_target}) + target_link_libraries(${test_target} PRIVATE -lc++experimental) endif() else() apply_cxx_coroutines_to(PRIVATE ${test_target}) |