diff options
| author | Chris Bieneman <beanz@apple.com> | 2015-09-25 23:29:03 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2015-09-25 23:29:03 +0000 |
| commit | cc8c7773c5587a888a06b771b323a29e5f5b41b1 (patch) | |
| tree | 325a9fa469dd3d71d8b0c9fc6f37cc78e2164f0a /compiler-rt/cmake | |
| parent | e1b09caaafc32398cdbbd62a77619162ec975707 (diff) | |
| download | bcm5719-llvm-cc8c7773c5587a888a06b771b323a29e5f5b41b1.tar.gz bcm5719-llvm-cc8c7773c5587a888a06b771b323a29e5f5b41b1.zip | |
[CMake] [darwin] Refactor darwin_read_exclude_file to be reusable. NFC.
Rename darwin_read_exclude_file to more generic darwin_read_list_from_file, and make it take the file path instead of constructing it so it can be reused more freely.
llvm-svn: 248635
Diffstat (limited to 'compiler-rt/cmake')
| -rw-r--r-- | compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake index 5f9d819ee6e..55a398ad412 100644 --- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake +++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake @@ -103,11 +103,11 @@ endfunction() set(DARWIN_EXCLUDE_DIR ${CMAKE_SOURCE_DIR}/lib/builtins/Darwin-excludes) # Read and process the exclude file into a list of symbols -function(darwin_read_exclude_file output_var file) - if(EXISTS ${DARWIN_EXCLUDE_DIR}/${file}.txt) - file(READ ${DARWIN_EXCLUDE_DIR}/${file}.txt ${file}_EXCLUDES) - string(REPLACE "\n" ";" ${file}_EXCLUDES ${${file}_EXCLUDES}) - set(${output_var} ${${file}_EXCLUDES} PARENT_SCOPE) +function(darwin_read_list_from_file output_var file) + if(EXISTS ${file}) + file(READ ${file} EXCLUDES) + string(REPLACE "\n" ";" EXCLUDES ${EXCLUDES}) + set(${output_var} ${EXCLUDES} PARENT_SCOPE) endif() endfunction() @@ -124,8 +124,10 @@ function(darwin_find_excluded_builtins_list output_var) message(FATAL_ERROR "Must specify OS and ARCH to darwin_find_excluded_builtins_list!") endif() - darwin_read_exclude_file(${LIB_OS}_BUILTINS ${LIB_OS}) - darwin_read_exclude_file(${LIB_OS}_${LIB_ARCH}_BASE_BUILTINS ${LIB_OS}-${LIB_ARCH}) + darwin_read_list_from_file(${LIB_OS}_BUILTINS + ${DARWIN_EXCLUDE_DIR}/${LIB_OS}.txt) + darwin_read_list_from_file(${LIB_OS}_${LIB_ARCH}_BASE_BUILTINS + ${DARWIN_EXCLUDE_DIR}/${LIB_OS}-${LIB_ARCH}.txt) if(LIB_MIN_VERSION) file(GLOB builtin_lists ${DARWIN_EXCLUDE_DIR}/${LIB_OS}*-${LIB_ARCH}.txt) @@ -141,7 +143,8 @@ function(darwin_find_excluded_builtins_list output_var) endforeach() if(smallest_version) - darwin_read_exclude_file(${LIB_ARCH}_${LIB_OS}_BUILTINS ${LIB_OS}${smallest_version}-${LIB_ARCH}) + darwin_read_list_from_file(${LIB_ARCH}_${LIB_OS}_BUILTINS + ${DARWIN_EXCLUDE_DIR}/${LIB_OS}${smallest_version}-${LIB_ARCH}.txt) endif() endif() |
