[llvm] 3577317 - [CMake][runtimes] Pass the CMAKE_ARGS to runtimes build correctly

[Petr Hosek via llvm-commits]

Author: Petr Hosek
Date: 2020-07-15T09:25:18-07:00
New Revision: 3577317b6d6b6e3fc4ae42b79900968620571886

URL: https://github.com/llvm/llvm-project/commit/3577317b6d6b6e3fc4ae42b79900968620571886
DIFF: https://github.com/llvm/llvm-project/commit/3577317b6d6b6e3fc4ae42b79900968620571886.diff

LOG: [CMake][runtimes] Pass the CMAKE_ARGS to runtimes build correctly

We were relying on CMAKE_ARGS argument to be passed to subbuild, but
this argument was never properly defined. This patch addresses that.

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

Added: 
    

Modified: 
    llvm/runtimes/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index d56f7af583ed..0f29e24a26eb 100644
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -413,7 +413,7 @@ else() # if this is included from LLVM's CMake
   # runtime_register_target(target)
   #   Utility function to register external runtime target.
   function(runtime_register_target name target)
-    cmake_parse_arguments(ARG "" "" "DEPENDS" ${ARGN})
+    cmake_parse_arguments(ARG "" "" "DEPENDS;CMAKE_ARGS" ${ARGN})
     include(${LLVM_BINARY_DIR}/runtimes/${name}/Components.cmake OPTIONAL)
     set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${LLVM_BINARY_DIR}/runtimes/${name}/Components.cmake)
 
@@ -457,6 +457,7 @@ else() # if this is included from LLVM's CMake
       set(test_targets "${test_targets}" PARENT_SCOPE)
     endif()
 
+    set(${name}_extra_args ${ARG_CMAKE_ARGS})
     get_cmake_property(variableNames VARIABLES)
     foreach(variableName ${variableNames})
       string(FIND "${variableName}" "RUNTIMES_${target}_" out)