Skip to content

vcpkg_configure_make: Fixes for mingw#18028

Closed
past-due wants to merge 3 commits intomicrosoft:masterfrom
past-due:mingw_configure_make_1
Closed

vcpkg_configure_make: Fixes for mingw#18028
past-due wants to merge 3 commits intomicrosoft:masterfrom
past-due:mingw_configure_make_1

Conversation

@past-due
Copy link
Contributor

@past-due past-due commented May 20, 2021

EDIT: Waiting on merge of #17137 and #17215 to rebase.

Describe the pull request

Various fixes / tweaks for vcpkg_configure_make and mingw.

  • mingw: Do not use compile / windres-rc wrappers.

  • mingw: Use the vcpkg-acquired msys binaries for objdump / nm

    • Otherwise mingw environments that use LLVM-based toolchains (example: the msys2 clang64 environment) cannot build ports as their objdump is preferred and its output differs enough that it isn't properly parsed by libtool.
  • mingw: Remove -luuid from default libs to avoid libtool errors that break builds.

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    mingw community triplets

@dg0yt
Copy link
Contributor

dg0yt commented May 20, 2021

This is mostly duplicating work which already has pending PR.

@dg0yt
Copy link
Contributor

dg0yt commented May 20, 2021

PS: I would have more changes to vcpkg_configure_make, but there is no point in stacking more PRs. CI runs take long for changes to this script, and quite often they run into unrelated problems.

@past-due
Copy link
Contributor Author

past-due commented May 20, 2021

This is mostly duplicating work which already has pending PR.

Thank you - had not noticed those. 🥳 I prefer #17137's changes for luuid fixes and can rebase the wrapper tweaks (ensuring RC and WINDRES are set) on top of #17215 once that's merged.

@past-due past-due marked this pull request as draft May 20, 2021 17:23
@JackBoosY JackBoosY added category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly depends:different-pr This PR or Issue depends on a PR which has been filed info:world-rebuild labels May 21, 2021
@past-due
Copy link
Contributor Author

@dg0yt I've gone ahead and pulled out the one main non-duplicated fix into #18055

Closing this in favor of your two PRs (#17137, #17215) and #18055.

@past-due past-due closed this May 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly depends:different-pr This PR or Issue depends on a PR which has been filed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants