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

ci: Drop duplicated compiler flags #29800

Merged
merged 1 commit into from
Apr 5, 2024

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Apr 3, 2024

On the master branch @ 0d509ba, it is easy to check the "Options used to compile and link" section in the configure script output and observe duplicated compiler flags.

This PR cleans such cases up.

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 3, 2024

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK maflcko, fanquake

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #29790 ([DO NOT MERGE] cmake: Migrate CI scripts to CMake-based build system -- WIP by hebasto)
  • #29742 ([WIP] ci: test secp256k1 MSAN asm annotations by fanquake)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@DrahtBot DrahtBot added the Tests label Apr 3, 2024
@maflcko
Copy link
Member

maflcko commented Apr 3, 2024

lgtm ACK be97652

The depends ones are not needed, because depends already passes the flags through. The -g isn't needed, because it is always set by default.

@@ -17,7 +17,7 @@ export PACKAGES="ninja-build"
# BDB generates false-positives and will be removed in future
export DEP_OPTS="DEBUG=1 NO_BDB=1 NO_QT=1 CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
export GOAL="install"
export BITCOIN_CONFIG="--with-sanitizers=memory --disable-hardening --with-asm=no CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
Copy link
Member

@fanquake fanquake Apr 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess going forward, we'll have to remember to never add any logic/other flags to the --with-sanitizers/cmake equivalent option, that differ from just setting -fsanitize=x? Otherwise they could possibly get missed in CI.

Removing this also now skips the link check(s) and I don't see where flags are getting added to LDFLAGS elsewhere? So this is at least a change in behaviour, some (not duplicated) flags have been dropped entirely, and I'd say somewhat less clear.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The --with-sanitizers=memory has been restored in the recent push.

@maflcko
Copy link
Member

maflcko commented Apr 5, 2024

re-ACK a3485af

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK a3485af - no-longer a change in behaviour.

@fanquake fanquake merged commit 3a8dc56 into bitcoin:master Apr 5, 2024
4 of 16 checks passed
@hebasto hebasto deleted the 240403-ci-cleanup branch April 5, 2024 16:10
Pttn added a commit to RiecoinTeam/Riecoin that referenced this pull request Apr 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants