Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ninja requirement #372

Merged
merged 2 commits into from
Mar 11, 2022
Merged

Remove ninja requirement #372

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d012347
remove ninja check in tool
Feb 24, 2022
fc6aa4b
ninja removal
Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions src/vcpkg/build.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,11 +657,6 @@ namespace vcpkg::Build
print2("Detecting compiler hash for triplet ", triplet, "...\n");
auto buildpath = paths.buildtrees() / "detect_compiler";

#if !defined(_WIN32)
// TODO: remove when vcpkg.exe is in charge for acquiring tools. Change introduced in vcpkg v0.0.107.
// bootstrap should have already downloaded ninja, but making sure it is present in case it was deleted.
(void)(paths.get_tool_exe(Tools::NINJA));
#endif
std::vector<CMakeVariable> cmake_args{
{"CURRENT_PORT_DIR", paths.scripts / "detect_compiler"},
{"CURRENT_BUILDTREES_DIR", buildpath},
Expand Down Expand Up @@ -741,11 +736,6 @@ namespace vcpkg::Build
const VcpkgPaths& paths,
const Dependencies::InstallPlanAction& action)
{
#if !defined(_WIN32)
// TODO: remove when vcpkg.exe is in charge for acquiring tools. Change introduced in vcpkg v0.0.107.
// bootstrap should have already downloaded ninja, but making sure it is present in case it was deleted.
(void)(paths.get_tool_exe(Tools::NINJA));
#endif
auto& scfl = action.source_control_file_and_location.value_or_exit(VCPKG_LINE_INFO);
auto& scf = *scfl.source_control_file;

Expand Down