[compiler-rt] 048e6bb - [CMake][compiler-rt] Treat target cflags as list rather than string

[Petr Hosek via llvm-commits]

Author: Petr Hosek
Date: 2022-06-24T22:37:00Z
New Revision: 048e6bb46bc2b800def49373fba75419b39d3249

URL: https://github.com/llvm/llvm-project/commit/048e6bb46bc2b800def49373fba75419b39d3249
DIFF: https://github.com/llvm/llvm-project/commit/048e6bb46bc2b800def49373fba75419b39d3249.diff

LOG: [CMake][compiler-rt] Treat target cflags as list rather than string

This is need after 30dfe016d4259398689dc1be163e0ecc804b5feb.

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 c7dc2b882d056..8374b50623e82 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")
-    set(linkopts -Wl,-G ${linkopts})
+    list(PREPEND linkopts -Wl,-G)
   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 856cd732d5175..f829c79b2797f 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)
-      set(target_cflags "--target=${target} ${target_cflags}")
+      list(PREPEND target_cflags --target=${target})
     endif()
     set(cxx_${arch}_merge_dir "${CMAKE_CURRENT_BINARY_DIR}/cxx_${arch}_merge.dir")
     file(MAKE_DIRECTORY ${cxx_${arch}_merge_dir})