MSVC: Position MSBFLAGS after flags it might override.

nmisch · nmisch · commit cc07e06b1eac · 2016-12-18T18:12:23.000-05:00
Christian Ullrich
diff --git a/src/tools/msvc/build.pl b/src/tools/msvc/build.pl
@@ -54,7 +54,7 @@ BEGIN
 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 @@ BEGIN
 }
 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ BEGIN`
`54`	`54`	`if ($buildwhat and $vcver >= 10.00)`
`55`	`55`	`{`
`56`	`56`	`system(`
`57`		`- "msbuild $buildwhat.vcxproj $msbflags /verbosity:normal /p:Configuration=$bconf"`
	`57`	`+ "msbuild $buildwhat.vcxproj /verbosity:normal $msbflags /p:Configuration=$bconf"`
`58`	`58`	`);`
`59`	`59`	`}`
`60`	`60`	`elsif ($buildwhat)`
`@@ -63,7 +63,7 @@ BEGIN`
`63`	`63`	`}`
`64`	`64`	`else`
`65`	`65`	`{`
`66`		`- system("msbuild pgsql.sln $msbflags /verbosity:normal /p:Configuration=$bconf");`
	`66`	`+ system("msbuild pgsql.sln /verbosity:normal $msbflags /p:Configuration=$bconf");`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`# report status`