[compiler-rt] r319241 - [XRay][compiler-rt] Fix runtime build

[Dean Michael Berris via llvm-commits]

Author: dberris
Date: Tue Nov 28 14:33:07 2017
New Revision: 319241

URL: http://llvm.org/viewvc/llvm-project?rev=319241&view=rev
Log:
[XRay][compiler-rt] Fix runtime build

This isolates the per-architecture files from the common files
implementing the XRay facilities. Because of the refactoring done in
D39114, we were including the definition of the sources in the archive
twice, causing link-time failures.

Follow-up to D39114.

Modified:
    compiler-rt/trunk/lib/xray/CMakeLists.txt

Modified: compiler-rt/trunk/lib/xray/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/xray/CMakeLists.txt?rev=319241&r1=319240&r2=319241&view=diff
==============================================================================
--- compiler-rt/trunk/lib/xray/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/xray/CMakeLists.txt Tue Nov 28 14:33:07 2017
@@ -13,47 +13,38 @@ set(XRAY_SOURCES
 
 set(x86_64_SOURCES
     xray_x86_64.cc
-    xray_trampoline_x86_64.S
-    ${XRAY_SOURCES})
+    xray_trampoline_x86_64.S)
 
 set(arm_SOURCES
     xray_arm.cc
-    xray_trampoline_arm.S
-    ${XRAY_SOURCES})
+    xray_trampoline_arm.S)
 
-set(armhf_SOURCES
-  ${arm_SOURCES})
+set(armhf_SOURCES)
 
 set(aarch64_SOURCES
   xray_AArch64.cc
-  xray_trampoline_AArch64.S
-  ${XRAY_SOURCES})
+  xray_trampoline_AArch64.S)
 
 set(mips_SOURCES
     xray_mips.cc
-    xray_trampoline_mips.S
-    ${XRAY_SOURCES})
+    xray_trampoline_mips.S)
 
 set(mipsel_SOURCES
     xray_mips.cc
-    xray_trampoline_mips.S
-    ${XRAY_SOURCES})
+    xray_trampoline_mips.S)
 
 set(mips64_SOURCES
     xray_mips64.cc
-    xray_trampoline_mips64.S
-    ${XRAY_SOURCES})
+    xray_trampoline_mips64.S)
 
 set(mips64el_SOURCES
     xray_mips64.cc
-    xray_trampoline_mips64.S
-    ${XRAY_SOURCES})
+    xray_trampoline_mips64.S)
 
 set(powerpc64le_SOURCES
-        xray_powerpc64.cc
-        xray_trampoline_powerpc64.cc
-        xray_trampoline_powerpc64_asm.S
-        ${XRAY_SOURCES})
+    xray_powerpc64.cc
+    xray_trampoline_powerpc64.cc
+    xray_trampoline_powerpc64_asm.S)
 
 include_directories(..)
 include_directories(../../include)