[compiler-rt] 72ec31a - [CMake] Use set rather than list PREPEND

[Petr Hosek via llvm-commits]

Author: Petr Hosek
Date: 2022-06-25T02:19:55Z
New Revision: 72ec31afadd01e413b34ee8d18233f659da3e8e8

URL: https://github.com/llvm/llvm-project/commit/72ec31afadd01e413b34ee8d18233f659da3e8e8
DIFF: https://github.com/llvm/llvm-project/commit/72ec31afadd01e413b34ee8d18233f659da3e8e8.diff

LOG: [CMake] Use set rather than list PREPEND

list PREPEND is only supported since CMake 3.15.

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

Added: 
    

Modified: 
    compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake
    compiler-rt/lib/fuzzer/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake
index 8374b50623e82..c7dc2b882d056 100644
--- a/compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake
+++ b/compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake
@@ -11,7 +11,7 @@ set(linkopts
   # > On AIX, runtime linking is no longer enabled by default.
   # See https://cmake.org/cmake/help/latest/release/3.16.html
   if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
-    list(PREPEND linkopts -Wl,-G)
+    set(linkopts -Wl,-G ${linkopts})
   endif()
   set(${link_flags} ${linkopts} PARENT_SCOPE)
 endfunction()

diff  --git a/compiler-rt/lib/fuzzer/CMakeLists.txt b/compiler-rt/lib/fuzzer/CMakeLists.txt
index f829c79b2797f..4500c4f134093 100644
--- a/compiler-rt/lib/fuzzer/CMakeLists.txt
+++ b/compiler-rt/lib/fuzzer/CMakeLists.txt
@@ -141,7 +141,7 @@ if(OS_NAME MATCHES "Linux|Fuchsia" AND
     get_target_flags_for_arch(${arch} target_cflags)
     if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
       get_compiler_rt_target(${arch} target)
-      list(PREPEND target_cflags --target=${target})
+      set(target_cflags --target=${target} ${target_cflags})
     endif()
     set(cxx_${arch}_merge_dir "${CMAKE_CURRENT_BINARY_DIR}/cxx_${arch}_merge.dir")
     file(MAKE_DIRECTORY ${cxx_${arch}_merge_dir})