Skip to content

Commit

Permalink
[botan] Fix parallel build (#7303)
Browse files Browse the repository at this point in the history
The build tool parallel argument should be passed in the regular
COMMAND case, not the NO_PARALLEL_COMMAND one.

Also the job number argument on Windows should not have a space between
the argument and number.
  • Loading branch information
alcroito authored and Rastaban committed Jul 17, 2019
1 parent 4d2d857 commit ab0ca36
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ports/botan/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ vcpkg_from_github(
if(CMAKE_HOST_WIN32)
vcpkg_find_acquire_program(JOM)
set(build_tool "${JOM}")
set(parallel_build "/J ${VCPKG_CONCURRENCY}")
set(parallel_build "/J${VCPKG_CONCURRENCY}")
else()
find_program(MAKE make)
set(build_tool "${MAKE}")
Expand Down Expand Up @@ -87,8 +87,8 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE)

message(STATUS "Build ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}")
vcpkg_execute_build_process(
COMMAND ${build_tool}
NO_PARALLEL_COMMAND "${build_tool} ${parallel_build}"
COMMAND "${build_tool}" ${parallel_build}
NO_PARALLEL_COMMAND "${build_tool}"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}"
LOGNAME build-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE})
message(STATUS "Build ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done")
Expand Down

0 comments on commit ab0ca36

Please sign in to comment.