0001-Correct-clang-compiler-flags.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132
  1. From 5ccaff351297bca0e254bbfd66e3f03fef9d9c75 Mon Sep 17 00:00:00 2001
  2. From: Khem Raj <raj.khem@gmail.com>
  3. Date: Fri, 10 Jan 2020 21:54:39 -0800
  4. Subject: [PATCH] Correct clang compiler flags
  5. Fix misplaced quotes, this was leading to spurious ; in compiler cmdline
  6. Remove demanding libc++, clang can link with both libc++ and libstdc++
  7. and platforms have their own defaults, user can demand non defaults via
  8. adding it to cmake flags
  9. Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/859]
  10. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  11. ---
  12. CMakeLists.txt | 2 +-
  13. 1 file changed, 1 insertion(+), 1 deletion(-)
  14. diff --git a/CMakeLists.txt b/CMakeLists.txt
  15. index 2d13117..c17354a 100644
  16. --- a/CMakeLists.txt
  17. +++ b/CMakeLists.txt
  18. @@ -154,7 +154,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
  19. endif()
  20. set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
  21. set (WEBSOCKETPP_BOOST_LIBS system thread)
  22. - set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here?
  23. + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
  24. if (NOT APPLE)
  25. add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these?
  26. endif ()
  27. --
  28. 2.24.1