NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit326d73c

committed

Second attempt at fixing MSVC build for68ab8e8.

After the previous fix in6f1f34c msvc ended up looking for psqlscan.cin the wrong directory.David's fix just forces the path to be adjusted. That's not aparticularly pretty fix, but it hopefully will make the buildfarm greenagain.Author: David RowleyDiscussion: CAKJS1f_9CCi_t+LEgV5GWoCj3wjavcMoDc5qfcf_A0UwpQoPoA@mail.gmail.com

1 parentb6afae7 commit326d73cCopy full SHA for 326d73c

File tree

1 file changed

-1

lines changed

src/tools/msvc
- Mkvcbuild.pm

1 file changed

-1

lines changed

`‎src/tools/msvc/Mkvcbuild.pm`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ my $frontend_extrasource = {`
`71`	`71`	`'src/bin/psql/psqlscan.l' ] };`
`72`	`72`	`my@frontend_excludes = (`
`73`	`73`	`'pgevent','pg_basebackup','pg_rewind','pg_dump',`
`74`		`-'pg_xlogdump','scripts');`
	`74`	`+'pg_xlogdump','scripts','pgbench');`
`75`	`75`
`76`	`76`	`submkvcbuild`
`77`	`77`	`{`
`@@ -674,6 +674,11 @@ sub mkvcbuild`
`674`	`674`	`}`
`675`	`675`	`$pg_xlogdump->AddFile('src/backend/access/transam/xlogreader.c');`
`676`	`676`
	`677`	`+# fix up pgbench once it's been set up`
	`678`	`+# we're borrowing psqlscan.c from psql, so grab it from the correct place`
	`679`	`+my$pgbench = AddSimpleFrontend('pgbench');`
	`680`	`+$pgbench->ReplaceFile('src/bin/pgbench/psqlscan.c','src/bin/psql/psqlscan.c');`
	`681`	`+`
`677`	`682`	`$solution->Save();`
`678`	`683`	`return$solution->{vcver};`
`679`	`684`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit326d73c

File tree

1 file changed

1 file changed

`‎src/tools/msvc/Mkvcbuild.pm`

0 commit comments