diff options
| author | Ilya Arzhannikov <iarzhannikov@artec-group.com> | 2021-04-02 21:40:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-02 12:40:16 -0700 |
| commit | 25d26e75948e3871061bef6a739a2794585a7aa1 (patch) | |
| tree | 9574b03ee08a6b71611c4a8e56ea00f0ad4b8b15 /scripts | |
| parent | 92608fb8b00384c504e95ffd4f5b84f5c492fa8a (diff) | |
| download | vcpkg-25d26e75948e3871061bef6a739a2794585a7aa1.tar.gz vcpkg-25d26e75948e3871061bef6a739a2794585a7aa1.zip | |
[vcpkg_build_make] pass no parallel command to execute_process when parallel build is disabled (#17018)
Co-authored-by: Ilya Arzhannikov <iarzhannikov@artec3d.com>
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 2560f93d4..722dbbd74 100755 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -187,7 +187,7 @@ function(vcpkg_build_make) if (_bc_DISABLE_PARALLEL)
vcpkg_execute_build_process(
- COMMAND ${MAKE_BASH} ${MAKE_CMD_LINE}
+ COMMAND ${MAKE_BASH} ${NO_PARALLEL_MAKE_CMD_LINE}
WORKING_DIRECTORY "${WORKING_DIRECTORY}"
LOGNAME "${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}${SHORT_BUILDTYPE}"
)
|