[vcpkg] Add missing debug statement and fix libc++ Filesystem TS issue.

studoot · May 3, 2018 · 120f444 · 120f444
1 parent 8f0ebdf
commit 120f444
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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",