From 06e14c1b6a5835c0e08c00b4670d0c6c5343dc98 Mon Sep 17 00:00:00 2001 From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)" Date: Sat, 12 Oct 2019 23:15:48 +0100 Subject: Add -lc++experimental to Coroutines linkage, hopefully fix travis. --- CMakeLists.txt | 7 ++++--- include/llfio/revision.hpp | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc8bfef9..5926f56b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,18 +168,19 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") else() set(USING_LIBCXX_ON_LINUX 1) # We had to use libc++ to get coroutines on Linux, so don't link the filesystem TS + # into the _dl edition, which is the coroutines-enabled edition target_link_libraries(${PROJECT_NAME}_hl INTERFACE ${libstdcxx_stdcxxfs} rt) target_link_libraries(${PROJECT_NAME}_sl PUBLIC ${libstdcxx_stdcxxfs} rt) foreach(special ${SPECIAL_BUILDS}) target_link_libraries(${PROJECT_NAME}_sl-${special} PUBLIC ${libstdcxx_stdcxxfs} rt) endforeach() - # Do make libc++ a requirement + # Do make libc++ a requirement for the _dl edition target_compile_definitions(${PROJECT_NAME}_dl PUBLIC _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM=1) target_compile_options(${PROJECT_NAME}_dl PUBLIC -stdlib=libc++) - target_link_libraries(${PROJECT_NAME}_dl PUBLIC -stdlib=libc++ -lc++abi) + target_link_libraries(${PROJECT_NAME}_dl PUBLIC -stdlib=libc++ -lc++abi -lc++experimental) foreach(special ${SPECIAL_BUILDS}) target_compile_options(${PROJECT_NAME}_dl-${special} PUBLIC -stdlib=libc++) - target_link_libraries(${PROJECT_NAME}_dl-${special} PUBLIC -stdlib=libc++ -lc++abi) + target_link_libraries(${PROJECT_NAME}_dl-${special} PUBLIC -stdlib=libc++ -lc++abi -lc++experimental) endforeach() endif() endif() diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp index 73ea6b3f..ae369fea 100644 --- a/include/llfio/revision.hpp +++ b/include/llfio/revision.hpp @@ -1,4 +1,4 @@ // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time -#define LLFIO_PREVIOUS_COMMIT_REF f7fd2da19f425f4fef4ade76bc4c81223d343536 -#define LLFIO_PREVIOUS_COMMIT_DATE "2019-10-12 14:53:21 +00:00" -#define LLFIO_PREVIOUS_COMMIT_UNIQUE f7fd2da1 +#define LLFIO_PREVIOUS_COMMIT_REF 7a854e59e7bb402399a590be35c2292b6f081268 +#define LLFIO_PREVIOUS_COMMIT_DATE "2019-10-12 15:17:03 +00:00" +#define LLFIO_PREVIOUS_COMMIT_UNIQUE 7a854e59 -- cgit v1.2.3