[vcpkg-make] Misc fixes, in particular: parallel builds #43249
+23
−15
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Enable restart in vcpkg_execute_build_process.
MonicaLiu0311
added
the
category:port-bug
dg0yt
commented
Jan 14, 2025
| vcpkg_execute_build_process( | ||
| COMMAND ${arg_SHELL} -c "${cmd}" | ||
| NO_PARALLEL_COMMAND ${arg_SHELL} -c "${no_par_cmd}" | ||
| ${no_par_cmd} |
There was a problem hiding this comment.
"Restarting without parallelism" shouldn't be displayed if the build was initiated without parallelism.
This is achieved by not passing the NO_PARALLEL_COMMAND option when arg_NO_PARALLEL_COMMAND is empty.
| @@ -557,7 +557,6 @@ function(z_vcpkg_make_prepare_flags) | |||
| ${flags_opts} | |||
| ) | |||
| if(NOT DEFINED VCPKG_BUILD_TYPE) | |||
| list(APPEND all_buildtypes DEBUG) | |||
There was a problem hiding this comment.
Unused in port vcpkg_make.
| @@ -97,7 +97,6 @@ function(vcpkg_make_configure) | |||
| set(opts "") | |||
| if(NOT arg_DISABLE_DEFAULT_OPTIONS) | |||
| z_vcpkg_make_default_path_and_configure_options(opts AUTOMAKE CONFIG "${configup}") | |||
| vcpkg_list(APPEND arg_OPTIONS ${opts}) | |||
There was a problem hiding this comment.
This appended the second config's options, to the first config's options, breaking the debug,relase build order.
| @@ -81,26 +81,27 @@ function(vcpkg_make_install) | |||
| endif() | |||
|
|
|||
| foreach(target IN LISTS arg_TARGETS) | |||
| string(REPLACE "/" "_" target_no_slash "${target}") | |||
There was a problem hiding this comment.
Most targets aren't "phony" but actual files. But filepaths must not be used to construct the log file name.
dg0yt
commented
Jan 14, 2025
| SHELL ${shell_cmd} | ||
| COMMAND ${configure_env} ${no_parallel_make_cmd_line} | ||
| COMMAND ${configure_env} ${make_cmd_line} |
There was a problem hiding this comment.
This is why the build wasn't parallel.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.