com php-src: prefer symbols read from the bin to those matching the naming scheme: win32/build/confutils.js

Commit: 4b472b07633c2288bef1a16cfbd695c494db2fa4 Author: Anatol Belski <ab@php.net> Sun, 30 Oct 2016 21:22:24 +0100 Parents: 4dfd7de974ef466d0da57c8c1aa929d015f20889 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4b472b07633c2288bef1a16cfbd695c494db2fa4 Log: prefer symbols read from the bin to those matching the naming scheme Changed paths: M win32/build/confutils.js Diff: diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 97090f5..0bb1f27 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -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];