summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Misch2016-12-18 23:12:23 +0000
committerNoah Misch2016-12-18 23:12:23 +0000
commitcc07e06b1eac538328b5d8e31e77fdd079135864 (patch)
tree7b93f0cd8626194b76925ae8de0530b2efd61002
parent4a0a34b5b678f0292d3a85a85fb10c79c393be26 (diff)
MSVC: Position MSBFLAGS after flags it might override.
Christian Ullrich
-rw-r--r--src/tools/msvc/build.pl4
-rwxr-xr-xsrc/tools/msvc/clean.bat2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/msvc/build.pl b/src/tools/msvc/build.pl
index 52739774c7..a5469cd289 100644
--- a/src/tools/msvc/build.pl
+++ b/src/tools/msvc/build.pl
@@ -54,7 +54,7 @@ elsif (uc($ARGV[0]) ne "RELEASE")
if ($buildwhat and $vcver >= 10.00)
{
system(
- "msbuild $buildwhat.vcxproj $msbflags /verbosity:normal /p:Configuration=$bconf"
+ "msbuild $buildwhat.vcxproj /verbosity:normal $msbflags /p:Configuration=$bconf"
);
}
elsif ($buildwhat)
@@ -63,7 +63,7 @@ elsif ($buildwhat)
}
else
{
- system("msbuild pgsql.sln $msbflags /verbosity:normal /p:Configuration=$bconf");
+ system("msbuild pgsql.sln /verbosity:normal $msbflags /p:Configuration=$bconf");
}
# report status
diff --git a/src/tools/msvc/clean.bat b/src/tools/msvc/clean.bat
index e21e37f6f7..e73df6e96f 100755
--- a/src/tools/msvc/clean.bat
+++ b/src/tools/msvc/clean.bat
@@ -107,6 +107,6 @@ REM for /r %%f in (*.sql) do if exist %%f.in del %%f
cd %D%
REM Clean up ecpg regression test files
-msbuild %MSBFLAGS% /NoLogo ecpg_regression.proj /t:clean /v:q
+msbuild ecpg_regression.proj /NoLogo /v:q %MSBFLAGS% /t:clean
goto :eof