bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge commit 'def04540a4' into sync_cg_clif-2023-11-16

Browse source
This commit is contained in:
bjorn3 2023-11-16 21:15:07 +00:00
commit 4db95ce3cb
15 changed files with 472 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_codegen_cranelift/scripts/rustup.sh
View file

@ -46,7 +46,7 @@ case $1 in
git pull origin master
branch=sync_cg_clif-$(date +%Y-%m-%d)
git checkout -b "$branch"
"$cg_clif/git-fixed-subtree.sh" pull --prefix=compiler/rustc_codegen_cranelift/ https://github.com/bjorn3/rustc_codegen_cranelift.git master
"$cg_clif/git-fixed-subtree.sh" pull --prefix=compiler/rustc_codegen_cranelift/ https://github.com/rust-lang/rustc_codegen_cranelift.git master
git push -u my "$branch"
# immediately merge the merge commit into cg_clif to prevent merge conflicts when syncing