summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Stellard <tstellar@redhat.com>2018-11-28 21:46:14 +0000
committerTom Stellard <tstellar@redhat.com>2018-11-28 21:46:14 +0000
commit9ad6d0609a950e769315ce172de57536564eb3dc (patch)
tree1c3c3df2f49ac933805921032dc88a3db275ae5e
parentf79f472aa167d5594584d0e340848df4c02e258c (diff)
downloadbcm5719-llvm-9ad6d0609a950e769315ce172de57536564eb3dc.tar.gz
bcm5719-llvm-9ad6d0609a950e769315ce172de57536564eb3dc.zip
Merging r342865:
------------------------------------------------------------------------ r342865 | courbet | 2018-09-24 01:39:48 -0700 (Mon, 24 Sep 2018) | 11 lines [llvm-exegesis] Fix PR39021. Summary: The `set` statements was incorrectly reading the value of the local variable and setting the value of the parent variable. Reviewers: tycho, gchatelet, john.brawn Subscribers: mgorny, tschuett, llvm-commits Differential Revision: https://reviews.llvm.org/D52343 ------------------------------------------------------------------------ llvm-svn: 347811
-rw-r--r--llvm/tools/llvm-exegesis/lib/CMakeLists.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/llvm/tools/llvm-exegesis/lib/CMakeLists.txt b/llvm/tools/llvm-exegesis/lib/CMakeLists.txt
index 175c2adf9de..194304adf98 100644
--- a/llvm/tools/llvm-exegesis/lib/CMakeLists.txt
+++ b/llvm/tools/llvm-exegesis/lib/CMakeLists.txt
@@ -1,12 +1,16 @@
+set(TARGETS_TO_APPEND "")
+
if (LLVM_TARGETS_TO_BUILD MATCHES "X86")
add_subdirectory(X86)
- set(LLVM_EXEGESIS_TARGETS "${LLVM_EXEGESIS_TARGETS} X86" PARENT_SCOPE)
+ set(TARGETS_TO_APPEND "${TARGETS_TO_APPEND} X86")
endif()
if (LLVM_TARGETS_TO_BUILD MATCHES "AArch64")
add_subdirectory(AArch64)
- set(LLVM_EXEGESIS_TARGETS "${LLVM_EXEGESIS_TARGETS} AArch64" PARENT_SCOPE)
+ set(TARGETS_TO_APPEND "${TARGETS_TO_APPEND} AArch64")
endif()
+set(LLVM_EXEGESIS_TARGETS "${LLVM_EXEGESIS_TARGETS} ${TARGETS_TO_APPEND}" PARENT_SCOPE)
+
add_library(LLVMExegesis
STATIC
Analysis.cpp
OpenPOWER on IntegriCloud