Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split out build info into another module #1776

Merged
merged 1 commit into from
Apr 13, 2021
Merged

Conversation

danobi
Copy link
Member

@danobi danobi commented Apr 6, 2021

7c40e2a ("build: Share core bpftrace code with test binary")
broke the libbpf build info b/c libbpftrace target wasn't given
the libbpf cmake vars.

This commit splits out the buildinfo such that the buildinfo is only
needed inside libbpftrace target. This is nicer b/c then we don't have
to pass cmake vars to multiple targets. It's also nicer b/c main.cpp
is less concerned with internal details like build flags.

Also note that this commit also defines LLVM_VERSION_* preprocessor
variables. I'm not sure where those variables were coming from (maybe
one of the llvm header files). It's probably better we define it
ourselves so things are more explicit.

Checklist
  • Language changes are updated in docs/reference_guide.md
  • User-visible and non-trivial changes updated in CHANGELOG.md
  • The new behaviour is covered by tests

@danobi danobi force-pushed the build_info branch 3 times, most recently from 1cf1f14 to 814b5bf Compare April 6, 2021 21:24
@danobi
Copy link
Member Author

danobi commented Apr 13, 2021

Gonna merge this tomorrow if there's no objections. The broken --info output is confusing

@fbs
Copy link
Member

fbs commented Apr 13, 2021

Looks ok, go for it:)

7c40e2a ("build: Share core bpftrace code with test binary")
broke the libbpf build info b/c libbpftrace target wasn't given
the libbpf cmake vars.

This commit splits out the buildinfo such that the buildinfo is only
needed inside libbpftrace target. This is nicer b/c then we don't have
to pass cmake vars to multiple targets. It's also nicer b/c main.cpp
is less concerned with internal details like build flags.

Also note that this commit also defines LLVM_VERSION_* preprocessor
variables. I'm not sure where those variables were coming from (maybe
one of the llvm header files). It's probably better we define it
ourselves so things are more explicit.
@danobi danobi merged commit e2fb442 into bpftrace:master Apr 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants