NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4d33a7f

committed

Fix Perl code which had broken the Windows build

The previous change wanted to avoid modifying $_ in grep, but the codejust made the change in a local variable and then lost it. Rewrite thecode using a separate map and grep, which is clearer anyway.Author: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>

1 parenta6f22e8 commit4d33a7fCopy full SHA for 4d33a7f

File tree

1 file changed

-5

lines changed

src/tools/msvc
- vcregress.pl

1 file changed

-5

lines changed

`‎src/tools/msvc/vcregress.pl`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -520,11 +520,9 @@ sub fetchRegressOpts`
`520`	`520`	`# Substitute known Makefile variables, then ignore options that retain`
`521`	`521`	`# an unhandled variable reference. Ignore anything that isn't an`
`522`	`522`	`# option starting with "--".`
`523`		`-@opts =grep {`
`524`		`-my$x =$_;`
`525`		`-$x =~s/\Q$(top_builddir)\E/\"$topdir\"/;`
`526`		`-$x !~/\$\(/ &&$x =~/^--/`
`527`		`-}split(/\s+/,$1);`
	`523`	`+@opts =grep { !/\$\(/ && /^--/ }`
	`524`	`+map { (my$x =$_) =~s/\Q$(top_builddir)\E/\"$topdir\"/;$x; }`
	`525`	`+split(/\s+/,$1);`
`528`	`526`	`}`
`529`	`527`	`if ($m =~/^\sENCODING\s=\s*(\S+)/m)`
`530`	`528`	`{`

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!

Commit4d33a7f

File tree

1 file changed

1 file changed

`‎src/tools/msvc/vcregress.pl`

0 commit comments