[llvm-branch-commits] [llvm-branch] r347811 - Merging r342865:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Wed Nov 28 13:46:14 2018
New Revision: 347811

URL: http://llvm.org/viewvc/llvm-project?rev=347811&view=rev
Log:
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
------------------------------------------------------------------------

Modified:
    llvm/branches/release_70/tools/llvm-exegesis/lib/CMakeLists.txt

Modified: llvm/branches/release_70/tools/llvm-exegesis/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/tools/llvm-exegesis/lib/CMakeLists.txt?rev=347811&r1=347810&r2=347811&view=diff
==============================================================================
--- llvm/branches/release_70/tools/llvm-exegesis/lib/CMakeLists.txt (original)
+++ llvm/branches/release_70/tools/llvm-exegesis/lib/CMakeLists.txt Wed Nov 28 13:46:14 2018
@@ -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