diff options
| author | Hongxu Xu <xuhongxu96@gmail.com> | 2019-04-25 07:05:53 +0800 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-04-24 18:05:53 -0500 |
| commit | 48f22127e8d58b331fa1f9e65dc765d05f83f62c (patch) | |
| tree | 3d94f0b9a4a494d590a91719a68d0c32dd9bda08 /toolsrc/src | |
| parent | 95b94ec3b18a9b90bc066deb023c54d07a229194 (diff) | |
| download | vcpkg-48f22127e8d58b331fa1f9e65dc765d05f83f62c.tar.gz vcpkg-48f22127e8d58b331fa1f9e65dc765d05f83f62c.zip | |
Specify GIT only when VCPKG_FORCE_SYSTEM_BINARIES is set (#6143)
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/build.cpp | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 43f1a6288..53b782edc 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -362,24 +362,31 @@ namespace vcpkg::Build }
const Toolset& toolset = paths.get_toolset(pre_build_info);
+
+ std::vector<System::CMakeVariable> variables {
+ {"CMD", "BUILD"},
+ {"PORT", config.scf.core_paragraph->name},
+ {"CURRENT_PORT_DIR", config.port_dir},
+ {"TARGET_TRIPLET", spec.triplet().canonical_name()},
+ {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()},
+ {"VCPKG_USE_HEAD_VERSION",
+ Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"},
+ {"DOWNLOADS", paths.downloads},
+ {"_VCPKG_NO_DOWNLOADS", !Util::Enum::to_bool(config.build_package_options.allow_downloads) ? "1" : "0"},
+ {"_VCPKG_DOWNLOAD_TOOL", to_string(config.build_package_options.download_tool)},
+ {"FEATURES", Strings::join(";", config.feature_list)},
+ {"ALL_FEATURES", all_features},
+ };
+
+ if (!System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value())
+ {
+ variables.push_back({"GIT", git_exe_path});
+ }
+
const std::string cmd_launch_cmake = System::make_cmake_cmd(
cmake_exe_path,
paths.ports_cmake,
- {
- {"CMD", "BUILD"},
- {"PORT", config.scf.core_paragraph->name},
- {"CURRENT_PORT_DIR", config.port_dir},
- {"TARGET_TRIPLET", spec.triplet().canonical_name()},
- {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()},
- {"VCPKG_USE_HEAD_VERSION",
- Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"},
- {"DOWNLOADS", paths.downloads},
- {"_VCPKG_NO_DOWNLOADS", !Util::Enum::to_bool(config.build_package_options.allow_downloads) ? "1" : "0"},
- {"_VCPKG_DOWNLOAD_TOOL", to_string(config.build_package_options.download_tool)},
- {"GIT", git_exe_path},
- {"FEATURES", Strings::join(";", config.feature_list)},
- {"ALL_FEATURES", all_features},
- });
+ variables);
auto command = make_build_env_cmd(pre_build_info, toolset);
if (!command.empty())
|