12345678910111213141516171819202122232425262728293031323334353637 |
- From 3d7469e6d46dd19a20500fdb56f21a0cc7198e9d Mon Sep 17 00:00:00 2001
- From: Jeremy Puhlman <jpuhlman@mvista.com>
- Date: Thu, 16 Jan 2020 21:16:10 +0000
- Subject: [PATCH] libcxx: Add compiler runtime library to link step for libcxx
- This corrects "undefined reference to __divti3"
- Upstream-Status: Inappropriate [configuration]
- Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
- Signed-off-by: Khem Raj <raj.khem@gmail.com>
- ---
- libcxx/src/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
- diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt
- index 12dcdf954405..54e446e2aecd 100644
- --- a/libcxx/src/CMakeLists.txt
- +++ b/libcxx/src/CMakeLists.txt
- @@ -212,7 +212,7 @@ if (LIBCXX_ENABLE_SHARED)
- add_library(cxx_shared SHARED ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
- target_include_directories(cxx_shared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
- target_link_libraries(cxx_shared PUBLIC cxx-headers
- - PRIVATE ${LIBCXX_LIBRARIES})
- + PRIVATE ${LIBCXX_LIBRARIES} "$$($$CC --print-libgcc-file-name)")
- set_target_properties(cxx_shared
- PROPERTIES
- COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
- @@ -290,7 +290,7 @@ if (LIBCXX_ENABLE_STATIC)
- add_library(cxx_static STATIC ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
- target_include_directories(cxx_static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
- target_link_libraries(cxx_static PUBLIC cxx-headers
- - PRIVATE ${LIBCXX_LIBRARIES})
- + PRIVATE ${LIBCXX_LIBRARIES} "$$($$CC --print-libgcc-file-name)")
- set_target_properties(cxx_static
- PROPERTIES
- COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
|