rust 1.40.0

This commit is contained in:
idriskalp
2020-01-07 17:56:20 +03:00
parent f8f88b7b70
commit fa36c66652
2 changed files with 50 additions and 2 deletions
@@ -0,0 +1,41 @@
From 1f68002cb725c6a8fb5ca8425c1c86495a053f4f Mon Sep 17 00:00:00 2001
From: Michal Gorny <mgorny@gentoo.org>
Date: Thu, 4 Apr 2019 14:21:38 +0000
Subject: [PATCH] [llvm] [cmake] Add additional headers only if they exist
Modify the add_header_files_for_glob() function to only add files
that do exist, rather than all matches of the glob. This fixes CMake
error when one of the include directories (which happen to include
/usr/include) contain broken symlinks.
Differential Revision: https://reviews.llvm.org/D59632
llvm-svn: 357701
---
llvm/cmake/modules/LLVMProcessSources.cmake | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/cmake/modules/LLVMProcessSources.cmake b/cmake/modules/LLVMProcessSources.cmake
index 7cbd2863500..d0be0e8b3ba 100644
--- a/src/llvm-project/llvm/cmake/modules/LLVMProcessSources.cmake
+++ b/src/llvm-project/llvm/cmake/modules/LLVMProcessSources.cmake
@@ -30,7 +30,15 @@ endmacro(add_td_sources)
function(add_header_files_for_glob hdrs_out glob)
file(GLOB hds ${glob})
- set(${hdrs_out} ${hds} PARENT_SCOPE)
+ set(filtered)
+ foreach(file ${hds})
+ # Explicit existence check is necessary to filter dangling symlinks
+ # out. See https://bugs.gentoo.org/674662.
+ if(EXISTS ${file})
+ list(APPEND filtered ${file})
+ endif()
+ endforeach()
+ set(${hdrs_out} ${filtered} PARENT_SCOPE)
endfunction(add_header_files_for_glob)
function(find_all_header_files hdrs_out additional_headerdirs)
--
2.21.0
+9 -2
View File
@@ -12,7 +12,7 @@
<IsA>app</IsA>
<Summary>Systems programming language focused on safety, speed and concurrency</Summary>
<Description>Systems programming language focused on safety, speed and concurrency</Description>
<Archive sha1sum="6ad0f778882c73a689c88e1ecdaab8e7b9ceb27b" type="targz">https://static.rust-lang.org/dist/rustc-1.38.0-src.tar.gz</Archive>
<Archive sha1sum="6d706deb2c54e31cf02996ef4909600fa7ed092f" type="targz">https://static.rust-lang.org/dist/rustc-1.40.0-src.tar.gz</Archive>
<AdditionalFiles>
<AdditionalFile target="config.toml">bootstrap-config.toml</AdditionalFile>
</AdditionalFiles>
@@ -35,7 +35,7 @@
</BuildDependencies>
<Patches>
<!-- <Patch level="1">bootstrap-1.38.patch</Patch> -->
<Patch level="1">0001-WIP-minimize-the-rust-std-component.patch</Patch>
<!-- <Patch level="1">0001-WIP-minimize-the-rust-std-component.patch</Patch> -->
</Patches>
</Source>
@@ -65,6 +65,13 @@
</Package>
<History>
<Update release="13">
<Date>2020-01-06</Date>
<Version>1.40.0</Version>
<Comment>Version bump.</Comment>
<Name>Idris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="12">
<Date>2019-10-21</Date>
<Version>1.38.0</Version>