summaryrefslogtreecommitdiff
path: root/lib/xray
diff options
context:
space:
mode:
authorSimon Dardis <simon.dardis@mips.com>2017-12-06 14:03:41 +0000
committerSimon Dardis <simon.dardis@mips.com>2017-12-06 14:03:41 +0000
commit92feb463e158b8a1492c04c281fa24c9674be4e8 (patch)
treef809e50352364e22e4cac8a0266c8556650b2877 /lib/xray
parentf90540054acae1c1b727102ab695b3849469dbd4 (diff)
[compiler-rt][xray][cmake] Fix a build issue caused by set/item mixup
r319165 introduced a change to CMakeLists.txt for xray where the set of supported architectures for XRay was iterated over, tested if they could be targeted then passed to add_compiler_rt_object_libraries. However all targets were passed, rather than the architecture that was just tested. For cases such as MIPS, where mips and mips64 are supported, cmake would then test if mips64 could be targetted resulting in an attempt to produce multiple identical logical target names, falling afowl of CMP0002. Reviewers: dberris Differential Revision: https://reviews.llvm.org/D40890 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@319893 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/xray')
-rw-r--r--lib/xray/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/xray/CMakeLists.txt b/lib/xray/CMakeLists.txt
index fd00f3a40..5547600b9 100644
--- a/lib/xray/CMakeLists.txt
+++ b/lib/xray/CMakeLists.txt
@@ -95,7 +95,7 @@ else()
foreach(arch ${XRAY_SUPPORTED_ARCH})
if(CAN_TARGET_${arch})
add_compiler_rt_object_libraries(RTXray
- ARCHS ${XRAY_SUPPORTED_ARCH}
+ ARCHS ${arch}
SOURCES ${XRAY_SOURCES} CFLAGS ${XRAY_CFLAGS}
DEFS ${XRAY_COMMON_DEFINITIONS})
add_compiler_rt_runtime(clang_rt.xray