Uploaded image for project: 'Core Server'
  1. Core Server
  2. SERVER-80958

Fix merge conflict in unfiltered_compile_flags

    XMLWordPrintableJSON

Details

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Major - P3 Major - P3
    • 7.2.0-rc0
    • None
    • None
    • None
    • Fully Compatible
    • ALL

    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
      Starting local Bazel server and connecting to it...
      ERROR: /home/ubuntu/.cache/bazel/_bazel_ubuntu/438e730df43f16e18dd90600e6cbe8fb/external/mongo_toolchain/BUILD.bazel:70:9: duplicate keyword argument: unfiltered_compile_flags
      ERROR: /home/ubuntu/mongo/src/mongo/platform/BUILD.bazel:3:11: While resolving toolchains for target //src/mongo/platform:visibility_test_libcommon: com.google.devtools.build.lib.packages.NoSuchTargetException: no such target '@mongo_toolchain//:platform': target 'platform' not declared in package '' defined by /home/ubuntu/.cache/bazel/_bazel_ubuntu/438e730df43f16e18dd90600e6cbe8fb/external/mongo_toolchain/BUILD.bazel (Tip: use `query "@mongo_toolchain//:*"` to see all the targets in that package)
      ERROR: Analysis of target '//src/mongo/platform:visibility_test_libcommon' failed; build aborted: 
      INFO: Elapsed time: 81.789s
      INFO: 0 processes.
      FAILED: Build did NOT complete successfully (3 packages loaded, 1 target configured)

      ```

      Attachments

        Activity

          People

            zack.winter@mongodb.com Zack Winter
            zack.winter@mongodb.com Zack Winter
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: