diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-05-08 20:52:53 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-05-08 20:52:53 -0700 |
| commit | 9223a08134bfa4afc5f9d9ac73ed7dd44092fb07 (patch) | |
| tree | df7b157fcc10e344aa900ddd42e2d624ed462452 | |
| parent | 92591846ccb3d90e39aab567b7b3f817390aec26 (diff) | |
| download | vcpkg-9223a08134bfa4afc5f9d9ac73ed7dd44092fb07.tar.gz vcpkg-9223a08134bfa4afc5f9d9ac73ed7dd44092fb07.zip | |
[vcpkg][folly] Fix post lint checks for folly.
| -rw-r--r-- | ports/folly/portfile.cmake | 4 | ||||
| -rw-r--r-- | toolsrc/src/PostBuildLint.cpp | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 75dceb5af..8f36fb160 100644 --- 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 index 294645e82..0d2f556c1 100644 --- 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", |