[llvm-branch-commits] [clang] [flang] [lld] [llvm] [Flang] LLVM_ENABLE_RUNTIMES=flang-rt (PR #110217)
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Mon Nov 18 02:59:57 PST 2024
h-vetinari wrote:
I've started trying to build out the state of this PR in conda-forge's infrastructure (which is a bit of a tedious process, because publicly available CI services have puny resources), will report back if I run into any issues. However, there's no need to wait if things are ready from the POV of reviewers (I can also raise an issue post-hoc).
To make it easier to carry the respective patches, I've rebased the current stack of PRs on 87bfa58a5a4b85416d2486797d0f21fc67da5cf3 (latest commit from main that's included in the stack of PRs). I've pushed the resulting [branch](https://github.com/h-vetinari/llvm-project/commits/flang-rt-rebase) to my fork, in case anyone's interested (you can verify that it has empty diff to https://github.com/llvm/llvm-project/pull/110217/commits/cfc6dbe925eec92ca2b7054ee4954faeaf4d1aa2, i.e. the current state of this PR).
In general, I feel that it's easier to handle stacked PRs if they get rebased onto main (rather than merging back changes into all participating branches). It would even suffice to have only one local branch for this, as long as one uses explicit hashes to push. E.g., based on the hashes in my branch, an update to all 4 PRs here would look as follows:
```
git push -f origin eff95173a62dd78619ffe4d37fdcc4528df41245:users/meinersbur/flang_runtime_split-headers
git push -f origin 022ab326c9366a953913f7db17efe6aa8e107708:users/meinersbur/flang_runtime_split-headers2
git push -f origin 904d5ae0b2fb13c09ff1537db06c24d50ee26f5f:users/meinersbur/flang_runtime_move-files
git push -f origin b5f37dbee9fe55f8afd13efc67eb5383f560584a:users/meinersbur/flang_runtime
```
I believe that tools like [graphite](https://app.graphite.dev) (which some people are already using for stacked PRs in LLVM) automate a bunch of that -- haven't tried that myself yet though.
https://github.com/llvm/llvm-project/pull/110217
More information about the llvm-branch-commits
mailing list