mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-11-27 07:21:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix MSVC installations with multiple "configure" files detected

Browse Source 
When installing binaries and libraries using the MSVC installation
routines, the operation gets done after moving to the root folder, whose
location is detected by checking if "configure" exists two times in a
row.  So, calling the installation script from src/tools/msvc/ with an
extra "configure" file four levels up the root path of the code tree
causes the execution to go further up, leading to a failure in finding
the builds.  This commit fixes the issue by moving to the root folder of
the code tree only once, when necessary.

Author: Arnold Müller
Reviewed-by: Daniel Gustafsson
Discussion: https://postgr.es/m/16343-f638f67e7e52b86c@postgresql.org
Backpatch-through: 9.5
This commit is contained in:
Michael Paquier 2020-05-21 14:41:15 +09:00
parent e1218f59ea
commit d2a9959907
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tools/msvc/Install.pm
View File

@ -63,8 +63,16 @@ sub Install
do "./config.pl" if (-f "config.pl");
}
chdir("../../..") if (-f "../../../configure");
chdir("../../../..") if (-f "../../../../configure");
# Move to the root path depending on the current location.
if (-f "../../../configure")
{
chdir("../../..");
}
elsif (-f "../../../../configure")
{
chdir("../../../..");
}
my $conf = "";
if (-d "debug")
{