From: Anatol Belski <ab@php.net>
Date: Sun, 30 Oct 2016 20:22:24 +0000 (+0100)
Subject: prefer symbols read from the bin to those matching the naming scheme
X-Git-Tag: php-7.1.0RC6~39^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b472b07633c2288bef1a16cfbd695c494db2fa4;p=php

prefer symbols read from the bin to those matching the naming scheme
---

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];