MSVC: Position MSBFLAGS after flags it might override.

Christian Ullrich

diff --git a/src/tools/msvc/build.pl b/src/tools/msvc/build.pl
index 52739774c792eba6b5581ee350d0cbf7707e4fef..a5469cd28985a4c1098426b0421329e30897bea2 100644 (file)
--- 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 e21e37f6f768a5940b3528e9a7504d6c077093f5..e73df6e96f8d802150bf5e3ec1a62cca41c4e6ce 100755 (executable)
--- 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