NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit7240962

committed

Fix msvc builds for ActivePerl > 5.24

From this version ActivePerl ships both a .lib and a .a file for theperl library, which our code would detect as there being no libraryavailable. Instead, we should pick the .lib version and use that.Report and suggested fix in bug #15065Author: Heath Lord

1 parent17b340a commit7240962Copy full SHA for 7240962

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: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -524,9 +524,11 @@ sub mkvcbuild`
`524`	`524`	`my$perl_path =$solution->{options}->{perl} .'\lib\CORE\perl';`
`525`	`525`
`526`	`526`	`# ActivePerl 5.16 provided perl516.lib; 5.18 provided libperl518.a`
	`527`	`+# Starting with ActivePerl 5.24, both perlnn.lib and libperlnn.a are provided.`
	`528`	`+# In this case, prefer .lib.`
`527`	`529`	`my@perl_libs =`
`528`	`530`	`grep {/perl\d+\.lib$\|libperl\d+\.a$/ }glob($perl_path);`
`529`		`-if (@perl_libs== 1)`
	`531`	`+if (@perl_libs> 0)`
`530`	`532`	`{`
`531`	`533`	`$plperl->AddLibrary($perl_libs[0]);`
`532`	`534`	`}`

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!

Commit7240962

File tree

1 file changed

1 file changed

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

0 commit comments