[SERVER-80958] Fix merge conflict in unfiltered_compile_flags Created: 11/Sep/23 Updated: 29/Oct/23 Resolved: 11/Sep/23 |
|
| Status: | Closed |
| Project: | Core Server |
| Component/s: | None |
| Affects Version/s: | None |
| Fix Version/s: | 7.2.0-rc0 |
| Type: | Bug | Priority: | Major - P3 |
| Reporter: | Zack Winter | Assignee: | Zack Winter |
| Resolution: | Fixed | Votes: | 0 |
| Labels: | None | ||
| Remaining Estimate: | Not Specified | ||
| Time Spent: | Not Specified | ||
| Original Estimate: | Not Specified | ||
| Backwards Compatibility: | Fully Compatible |
| Operating System: | ALL |
| Participants: |
| Description |
|
https://github.com/10gen/mongo/pull/15483 and https://github.com/10gen/mongo/pull/15511 conflicted, but this wasn't noticed by git's merge conflict detection. Both of these changes added fields to a new parameter "unfiltered_compile_flags" to the bazel toolchain config. Instead of merging the fields each PR added, it added two instances of "unfiltered_compile_flags".
As a result, all bazel compilation will currently throw an error noting the duplicate keyword:
``` /tmp/bazelisk build src/mongo/platform:visibility_test_libcommon ``` |
| Comments |
| Comment by Githook User [ 11/Sep/23 ] |
|
Author: {'name': 'Zack Winter', 'email': 'zack.winter@mongodb.com', 'username': 'zackwintermdb'}Message: |