diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-05-03 15:51:02 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-05-03 15:51:02 -0700 |
| commit | 120f444af37f4b6e2cb4205b0ef5f8c6b97e8637 (patch) | |
| tree | d79bf17fd7de6979f7224d007524b0964ee8de8a /toolsrc/src | |
| parent | 8f0ebdf8d561ef8402db44cd9abb2c912cff276d (diff) | |
| download | vcpkg-120f444af37f4b6e2cb4205b0ef5f8c6b97e8637.tar.gz vcpkg-120f444af37f4b6e2cb4205b0ef5f8c6b97e8637.zip | |
[vcpkg] Add missing debug statement and fix libc++ Filesystem TS issue.
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/base/system.cpp | 5 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/build.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp index d4210fe6d..95c9511f9 100644 --- a/toolsrc/src/vcpkg/base/system.cpp +++ b/toolsrc/src/vcpkg/base/system.cpp @@ -274,8 +274,11 @@ namespace vcpkg::System Debug::println("CreateProcessW() returned %lu", exit_code); return static_cast<int>(exit_code); #else + Debug::println("system(%s)", cmd_line.c_str()); fflush(nullptr); - return system(cmd_line.c_str()); + int rc = system(cmd_line.c_str()); + Debug::println("system() returned %d", rc); + return rc; #endif } diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 7a9d35667..3616348d6 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -357,7 +357,7 @@ namespace vcpkg::Build { {"CMD", "BUILD"}, {"PORT", config.scf.core_paragraph->name}, - {"CURRENT_PORT_DIR", config.port_dir / "/."}, + {"CURRENT_PORT_DIR", config.port_dir}, {"TARGET_TRIPLET", spec.triplet().canonical_name()}, {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()}, {"VCPKG_USE_HEAD_VERSION", |