[compiler-rt] r252365 - [CMake] Need to filter ${arch}/*.c builtins as well as ${arch}/*.S builtins.

Chris Bieneman via llvm-commits llvm-commits at lists.llvm.org
Fri Nov 6 15:19:29 PST 2015


Author: cbieneman
Date: Fri Nov  6 17:19:29 2015
New Revision: 252365

URL: http://llvm.org/viewvc/llvm-project?rev=252365&view=rev
Log:
[CMake] Need to filter ${arch}/*.c builtins as well as ${arch}/*.S builtins.

This was broken in r248542 when I refactored this to support builtins where ${arch} didn't match the directory prefix (i.e. armv7s).

Modified:
    compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake

Modified: compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake?rev=252365&r1=252364&r2=252365&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake Fri Nov  6 17:19:29 2015
@@ -220,7 +220,7 @@ function(darwin_filter_builtin_sources o
     list(FIND ${excluded_list} ${_name_we} _found)
     if(_found ${filter_action} ${filter_value})
       list(REMOVE_ITEM intermediate ${_file})
-    elseif(${_file} MATCHES ".*/.*\\.S")
+    elseif(${_file} MATCHES ".*/.*\\.S" OR ${_file} MATCHES ".*/.*\\.c")
       get_filename_component(_name ${_file} NAME)
       string(REPLACE ".S" ".c" _cname "${_name}")
       list(REMOVE_ITEM intermediate ${_cname})




More information about the llvm-commits mailing list