summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-10-30 21:22:24 +0100
committerAnatol Belski <ab@php.net>2016-10-30 21:26:19 +0100
commit4b472b07633c2288bef1a16cfbd695c494db2fa4 (patch)
treee14c8628b4756f6a49f294b1e5075678783eec3c
parent4dfd7de974ef466d0da57c8c1aa929d015f20889 (diff)
downloadphp-git-4b472b07633c2288bef1a16cfbd695c494db2fa4.tar.gz
prefer symbols read from the bin to those matching the naming scheme
-rw-r--r--win32/build/confutils.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 97090f5332..0bb1f27818 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];