@@ -5,7 +5,7 @@ use crate::core::compiler::{CompileKind, CompileMode, RustcTargetData, Unit};
5
5
use crate :: core:: profiles:: { Profiles , UnitFor } ;
6
6
use crate :: core:: resolver:: features:: { CliFeatures , FeaturesFor , ResolvedFeatures } ;
7
7
use crate :: core:: resolver:: HasDevUnits ;
8
- use crate :: core:: { Dependency , PackageId , PackageSet , Resolve , SourceId , Workspace } ;
8
+ use crate :: core:: { Dependency , GitReference , PackageId , PackageSet , Resolve , SourceId , Workspace } ;
9
9
use crate :: ops:: { self , Packages } ;
10
10
use crate :: util:: errors:: CargoResult ;
11
11
use std:: collections:: { HashMap , HashSet } ;
@@ -43,14 +43,22 @@ pub fn resolve_std<'cfg>(
43
43
"rustc-std-workspace-alloc" ,
44
44
"rustc-std-workspace-std" ,
45
45
] ;
46
- let patches = to_patch
46
+ let mut patches = to_patch
47
47
. iter ( )
48
48
. map ( |& name| {
49
49
let source_path = SourceId :: for_path ( & src_path. join ( "library" ) . join ( name) ) ?;
50
50
let dep = Dependency :: parse ( name, None , source_path) ?;
51
51
Ok ( dep)
52
52
} )
53
53
. collect :: < CargoResult < Vec < _ > > > ( ) ?;
54
+ patches. push ( Dependency :: parse (
55
+ "compiler_builtins" ,
56
+ None ,
57
+ SourceId :: for_git (
58
+ & ( "https://github.com/solana-labs/compiler-builtins" . parse ( ) ) . unwrap ( ) ,
59
+ GitReference :: Tag ( "bpf-tools-v1.27" . to_string ( ) ) ,
60
+ ) ?,
61
+ ) ?) ;
54
62
let crates_io_url = crate :: sources:: CRATES_IO_INDEX . parse ( ) . unwrap ( ) ;
55
63
let mut patch = HashMap :: new ( ) ;
56
64
patch. insert ( crates_io_url, patches) ;
0 commit comments