[vcpkg][folly] Fix post lint checks for folly.

microsoft · May 9, 2017 · 9223a08 · 9223a08
1 parent 9259184
commit 9223a08
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
@@ -34,6 +34,10 @@ vcpkg_configure_cmake(
         -DMSVC_USE_STATIC_RUNTIME=${MSVC_USE_STATIC_RUNTIME}
 )
 
+# Folly runs built executables during the build, so they need access to the installed DLLs.
+# TODO: Confirm it's ok that we aren't adding the debug/bin folder.
+set(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin")
+
 vcpkg_install_cmake()
 
 vcpkg_copy_pdbs()

diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp
@@ -427,6 +427,11 @@ namespace vcpkg::PostBuildLint
                                "The file extension was not .lib: %s",
                                file.generic_string());
             COFFFileReader::LibInfo info = COFFFileReader::read_lib(file);
+
+            // This is zero for folly's debug library
+            // TODO: Why?
+            if (info.machine_types.size() == 0) return LintStatus::SUCCESS;
+
             Checks::check_exit(VCPKG_LINE_INFO,
                                info.machine_types.size() == 1,
                                "Found more than 1 architecture in file %s",