Skip to content

Commit

Permalink
[libpq] only require bison and flex on Windows (#12674)
Browse files Browse the repository at this point in the history
Signed-off-by: Andrei Lebedev <[email protected]>
  • Loading branch information
lebdron authored Aug 5, 2020
1 parent e79a4f3 commit 11f15f3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ports/libpq/CONTROL
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: libpq
Version: 12.2
Port-Version: 5
Port-Version: 6
Build-Depends: libpq[bonjour] (osx)
Supports: !uwp
Homepage: https://www.postgresql.org/
Expand Down
6 changes: 5 additions & 1 deletion ports/libpq/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,11 @@ vcpkg_extract_source_archive_ex(
)
unset(buildenv_contents)
# Get paths to required programs
foreach(program_name BISON FLEX PERL)
set(REQUIRED_PROGRAMS PERL)
if(VCPKG_TARGET_IS_WINDOWS)
list(APPEND REQUIRED_PROGRAMS BISON FLEX)
endif()
foreach(program_name ${REQUIRED_PROGRAMS})
# Need to rename win_bison and win_flex to just bison and flex
vcpkg_find_acquire_program(${program_name})
get_filename_component(${program_name}_EXE_PATH ${${program_name}} DIRECTORY)
Expand Down

0 comments on commit 11f15f3

Please sign in to comment.