archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.0' into PHP-7.1

Browse source 
* PHP-7.0:
  prefer symbols read from the bin to those matching the naming scheme
This commit is contained in:
Anatol Belski 2016-10-30 21:27:35 +01:00
commit 5c793bf2ac
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
win32/build/confutils.js
View file

@ -655,7 +655,6 @@ function copy_dep_pdb_into_build_dir(libpath)
var names = [];
var libname = FSO.GetFileName(libpath);
names.push(libname.replace(new RegExp("\\.lib$"), ".pdb"));
/* Within same .lib, everything should be bound to the same .pdb. No check
for every single object in the static libs. */
@ -677,6 +676,10 @@ function copy_dep_pdb_into_build_dir(libpath)
}
}
/* This is rather a fallback, if the bin has no debug section or
something went wrong with parsing. */
names.push(libname.replace(new RegExp("\\.lib$"), ".pdb"));
for (var k = 0; k < names.length; k++) {
var pdbname = names[k];