From 8c753b4791fb7f736c06218b059377e680c80c88 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 496429f3841e..99ca892533b1 100644
|
--- a/libcxx/src/CMakeLists.txt
|
+++ b/libcxx/src/CMakeLists.txt
|
@@ -194,7 +194,7 @@ split_list(LIBCXX_LINK_FLAGS)
|
if (LIBCXX_ENABLE_SHARED)
|
add_library(cxx_shared SHARED ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
|
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}"
|
@@ -272,7 +272,7 @@ set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
|
if (LIBCXX_ENABLE_STATIC)
|
add_library(cxx_static STATIC ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
|
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}"
|