Skip to content

[vcpkg_build_make] Always use msys make on win32 host#19164

Merged
dan-shaw merged 1 commit intomicrosoft:masterfrom
dg0yt:make-tool
Aug 2, 2021
Merged

[vcpkg_build_make] Always use msys make on win32 host#19164
dan-shaw merged 1 commit intomicrosoft:masterfrom
dg0yt:make-tool

Conversation

@dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Jul 27, 2021

  • What does your PR fix?

    This PR ensures that cmake_build_make uses the make program it acquires via msys, instead of allowing an instance of make which is earlier in the path, e.g. side by side with the compiler.
    Fixes issues like [libiconv:x64-mingw-dynamic] build failure #19117, hopefully (mingw32-make invoked as make with mingw32-w64 toolchain from Chocolatey.)

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

    all (changing behaviour for windows hosts), no

  • Does your PR follow the maintainer guide?

    yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    not needed

@NancyLi1013 NancyLi1013 added the category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly label Jul 27, 2021
@NancyLi1013 NancyLi1013 changed the title Always use msys make on win32 host [vcpkg_build_make] Always use msys make on win32 host Jul 27, 2021
@cenit
Copy link
Contributor

cenit commented Jul 27, 2021

why not adding no_default_paths too?

@dg0yt
Copy link
Contributor Author

dg0yt commented Jul 28, 2021

@cenit You are right, I meant to add this too.

@NancyLi1013 NancyLi1013 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Jul 29, 2021
@dan-shaw dan-shaw merged commit 7793524 into microsoft:master Aug 2, 2021
@dg0yt dg0yt deleted the make-tool branch August 3, 2021 04:08
strega-nil-ms pushed a commit to strega-nil/vcpkg that referenced this pull request Aug 6, 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 info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants