cli: Fix parsing of --export flags
#28
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vadorovsky
force-pushed
the
fix-tests
branch
13 times, most recently
from
aed121b to
f3ced12
Compare
Signed-off-by: Michal Rostecki <[email protected]>
Using nightly for running clippy often causes warnings which are about non-stabilized features. Since we support building bpf-linker with stable, let's use it for clippy as well. Signed-off-by: Michal Rostecki <[email protected]>
Signed-off-by: Michal Rostecki <[email protected]>
All assembly tests depend on FileCheck, which has to be installed through the llvm-tools package. Signed-off-by: Michal Rostecki <[email protected]>
Signed-off-by: Michal Rostecki <[email protected]>
vadorovsky
force-pushed
the
fix-tests
branch
2 times, most recently
from
efd305a to
e5b949a
Compare
alessandrod
approved these changes
Dec 24, 2022
| @@ -75,6 +75,15 @@ jobs: | |||
| sudo apt-get update | |||
| sudo apt-get install llvm-${{ matrix.llvm }}-dev libclang-${{ matrix.llvm }}-dev | |||
|
|
|||
| - name: Install LLVM tools | |||
There was a problem hiding this comment.
does the rustup component llvm-tools-preview not include filecheck?
There was a problem hiding this comment.
seems like no
$ docker run --rm -it rust:1.66 bash
root@629bf09695e7:/# rustup component add llvm-tools-preview
info: downloading component 'llvm-tools-preview'
info: installing component 'llvm-tools-preview'
32.9 MiB / 32.9 MiB (100 %) 22.3 MiB/s in 1s ETA: 0s
root@629bf09695e7:/# FileCheck
bash: FileCheck: command not found
root@629bf09695e7:/# find / -name "*FileCheck*"
root@629bf09695e7:/#
Those flags, even when passed multiple times, are always prepend with `--export` when they come from rustc. Delimiter can be used, but we shouldn't include any positional arguments after the flag as a part of that flag. Therefore, we use the combination of `use_value_delimiter = true` and `num_args = 1` options to ensure that. That bug can be reproduced by running bpf-linker together with rustc after rust-lang/rust@7f06d51 which passes the following sequence of arguments to the linker: ``` [...] --export connect --export some_dep /tmp/rusdep /tmp/rustcwUehHK/symbols.o /tmp/bin.bin.3b77bbea-cgu.0.rcgu.o -L /tmp -L /home/vadorovsky/repos/bpf-linker/target/debug/deps [...] ``` `/tmp/rustdep`, `symbols.o` and `*.rcgu.o` are inputs, but bpf-linker was parsing them as symbols to export. Therefore, `symbols.o` and `*.rcgu.o` were not linked, bpf-linker was ending up just linking dependencies / external crates together and not including the main program. Fixes: aya-rs#27 Signed-off-by: Michal Rostecki <[email protected]>
vadorovsky
force-pushed
the
fix-tests
branch
from
e5b949a to
17159a9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Those flags, even when passed multiple times, are always prepend with
--exportwhen they come from rustc. Delimiter can be used, but weshouldn't include any positional arguments after the flag as a part of
that flag. Therefore, we use the combination of
use_value_delimiter = trueandnum_args = 1options to ensure that.That bug can be reproduced by running bpf-linker together with rustc
after rust-lang/rust@7f06d51
which passes the following sequence of arguments to the linker:
/tmp/rustdep,symbols.oand*.rcgu.oare inputs, butbpf-linker was parsing them as symbols to export. Therefore,
symbols.oand
*.rcgu.owere not linked, bpf-linker was ending up just linkingdependencies / external crates together and not including the main
program.
Fixes: #27
Signed-off-by: Michal Rostecki [email protected]