diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-08-03 01:51:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 16:51:02 -0700 |
| commit | 77935240e5049da73d41ea74b9b910fe94519b37 (patch) | |
| tree | 3c2ec28df69856a8e01c5e06b1e98d46095f73ba /scripts | |
| parent | e47b72b64686d802d7e2c46f0afc7b1f2704809f (diff) | |
| download | vcpkg-77935240e5049da73d41ea74b9b910fe94519b37.tar.gz vcpkg-77935240e5049da73d41ea74b9b910fe94519b37.zip | |
Always use msys make on win32 host (#19164)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/cmake/vcpkg_build_make.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 6bd84c5ad..30b073c50 100755 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -88,7 +88,7 @@ function(vcpkg_build_make) set(PATH_GLOBAL "$ENV{PATH}")
vcpkg_add_to_path(PREPEND "${SCRIPTS}/buildsystems/make_wrapper")
vcpkg_acquire_msys(MSYS_ROOT)
- find_program(MAKE make REQUIRED)
+ find_program(MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED)
set(MAKE_COMMAND "${MAKE}")
set(MAKE_OPTS ${_bc_MAKE_OPTIONS} -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET})
set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} -j 1 --trace -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET})
|