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

Correct windows build flags for clang-cl/msvc-cl under opt/fastbuild/dbg #13133

Merged
merged 10 commits into from
Oct 11, 2020
Merged

Correct windows build flags for clang-cl/msvc-cl under opt/fastbuild/dbg #13133

merged 10 commits into from
Oct 11, 2020

Commits on Oct 2, 2020

  1. Draft changes to better support -c fastbuild on Windows

    - Move what were '--config=msvc-cl' settings out of .bazelrc into the
      default cflags for Windows compilation. This enables bazel build ...
      and bazel test ... to simply work out of the box.
    
    - Cleans up .bazelrc lists of windows vs. clang-cl settings, dividing
      the list into desired toggles vs. bazel or envoy bug workarounds
    
    - Fix errors in curl library creation in fastbuild on Windows
    
    - Introduce toggles and defaults for alwayslink argument to library objects.
      Defaults remain the same for now.
    
    - Introduce, but do not toggle clang-cl flags (this will arrive in a
      later PR when we resolve the opt build errors missing intrinsic base
      class destructors in the mock classes)
    
    Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
    Signed-off-by: William A Rowe Jr <wrowe@vmware.com>
    Co-authored-by: Sunjay Bhatia <sunjayb@vmware.com>
    Co-authored-by: William A Rowe Jr <wrowe@vmware.com>
    wrowe and sunjayBhatia committed Oct 2, 2020
    Configuration menu
    Copy the full SHA
    bec2a2d View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2020

  1. Merge remote-tracking branch 'origin/master' into fix-windows-fastbui…

    …ld-default
    
    Signed-off-by: William A Rowe Jr <wrowe@vmware.com>
    wrowe committed Oct 6, 2020
    Configuration menu
    Copy the full SHA
    b556bd5 View commit details
    Browse the repository at this point in the history
  2. Confirm redundant toggle, document issue/workaround

    Correct flag '--features' typo
    
    Signed-off-by: William A Rowe Jr <wrowe@vmware.com>
    wrowe committed Oct 6, 2020
    Configuration menu
    Copy the full SHA
    47634e8 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2020

  1. Update the curl.patch for greater reliability

    - The CMP0091 rule cannot simply be disabled, it breaks any build where
      that rule isn't recognized by the installed cmake.
    
    - Applying a limit of rules applicable to CMake 3.16 breaks corrections made
      to later versions of CMake.
    
    - Using -U0 for the delta of this patch decreases the likelyhood it might not
      apply cleanly to the next iteration of curl.
    
    - This now corrects both windows msvc-cl fastbuild and all clang-cl builds.
    
    - All of this becomes irrelevant once this issue is addressed;
      #11816
    
    Signed-off-by: William A Rowe Jr <wrowe@vmware.com>
    wrowe committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    dd5d011 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/master' into fix-windows-fastbui…

    …ld-default
    
    Signed-off-by: William A Rowe Jr <wrowe@vmware.com>
    wrowe committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    3eff4c5 View commit details
    Browse the repository at this point in the history
  3. Drop no-op flag

    - With the correct CFLAGS handling, the flags are correctly passed from
      bazel while building curl using rules_foreign_cc. This override is no
      longer applicable.
    
    Signed-off-by: William A Rowe Jr <wrowe@vmware.com>
    wrowe committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    77c7249 View commit details
    Browse the repository at this point in the history
  4. Note upstream patch submission

    Signed-off-by: William A Rowe Jr <wrowe@vmware.com>
    wrowe committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    49cf93c View commit details
    Browse the repository at this point in the history
  5. Correct typo

    Signed-off-by: William A Rowe Jr <wrowe@vmware.com>
    wrowe committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    1155f5c View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2020

  1. Revise patch to reflect PR discussion at curl

    Signed-off-by: William A Rowe Jr <wrowe@vmware.com>
    wrowe committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    3520884 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/master' into fix-windows-fastbui…

    …ld-default
    
    Signed-off-by: William A Rowe Jr <wrowe@vmware.com>
    wrowe committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    7ede887 View commit details
    Browse the repository at this point in the history