[llvm-branch-commits] [compiler-rt-branch] r362765 - Merging r353905:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Thu Jun  6 19:44:23 2019
New Revision: 362765

URL: http://llvm.org/viewvc/llvm-project?rev=362765&view=rev
Log:
Merging r353905:

------------------------------------------------------------------------
r353905 | hubert.reinterpretcast | 2019-02-12 16:55:30 -0800 (Tue, 12 Feb 2019) | 17 lines

[xray][tests][RHDTS] Add -lstdc++ after LLVM libs, resolving link error with RHDTS

Summary:
A link error was encountered when using the Red Hat Developer Toolset.
In the RHDTS, `libstdc++.so` is a linker script that may resolve symbols
to a static library. This patch places `-lstdc++` later in the ordering.

Reviewers: sfertile, nemanjai, tstellar, dberris

Reviewed By: dberris

Subscribers: dberris, mgorny, delcypher, jdoerfert, #sanitizers, llvm-commits

Tags: #llvm, #sanitizers

Differential Revision: https://reviews.llvm.org/D58144

------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_80/lib/xray/tests/CMakeLists.txt

Modified: compiler-rt/branches/release_80/lib/xray/tests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_80/lib/xray/tests/CMakeLists.txt?rev=362765&r1=362764&r2=362765&view=diff
==============================================================================
--- compiler-rt/branches/release_80/lib/xray/tests/CMakeLists.txt (original)
+++ compiler-rt/branches/release_80/lib/xray/tests/CMakeLists.txt Thu Jun  6 19:44:23 2019
@@ -48,8 +48,7 @@ endfunction()
 
 set(XRAY_TEST_ARCH ${XRAY_SUPPORTED_ARCH})
 set(XRAY_UNITTEST_LINK_FLAGS
-  ${CMAKE_THREAD_LIBS_INIT}
-  -l${SANITIZER_CXX_ABI_LIBRARY})
+  ${CMAKE_THREAD_LIBS_INIT})
 
 if (NOT APPLE)
   # Needed by LLVMSupport.
@@ -81,6 +80,8 @@ if (NOT APPLE)
   append_list_if(COMPILER_RT_HAS_LIBEXECINFO -lexecinfo XRAY_UNITTEST_LINK_FLAGS)
 endif()
 
+list(APPEND XRAY_UNITTEST_LINK_FLAGS -l${SANITIZER_CXX_ABI_LIBRARY})
+
 macro(add_xray_unittest testname)
   cmake_parse_arguments(TEST "" "" "SOURCES;HEADERS" ${ARGN})
   if(UNIX AND NOT APPLE)