diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 15:02:06 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 15:02:06 +0000 |
| commit | 04a2598f7ad48a6c7d31a77f37638c167704844e (patch) | |
| tree | c28642493211f918c9362a3fd0207dd8011caced | |
| parent | 07baa184e1f05751a1fcaf77225c6710a3dd77d2 (diff) | |
| download | chromium_src-04a2598f7ad48a6c7d31a77f37638c167704844e.zip chromium_src-04a2598f7ad48a6c7d31a77f37638c167704844e.tar.gz chromium_src-04a2598f7ad48a6c7d31a77f37638c167704844e.tar.bz2 | |
Fix pdb for chrome_split_dll=1
Remove from passed in linker command line, and generate our own.
NOTRY=true
R=cpu@chromium.org
BUG=237249
Review URL: https://chromiumcodereview.appspot.com/14952011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200267 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | tools/win/split_link/split_link.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/win/split_link/split_link.py b/tools/win/split_link/split_link.py index 344b349..2b035c5 100644 --- a/tools/win/split_link/split_link.py +++ b/tools/win/split_link/split_link.py @@ -54,6 +54,8 @@ def GetFlagsAndInputs(argv): continue if lower_arg.startswith('/manifestfile:'): continue + if lower_arg.startswith('/pdb:'): + continue if (not lower_arg.startswith('/') and lower_arg.endswith(('.obj', '.lib', '.res'))): inputs.append(arg) @@ -154,6 +156,10 @@ def ManifestNameForIndex(index): return OutputNameForIndex(index) + '.intermediate.manifest' +def PdbNameForIndex(index): + return OutputNameForIndex(index) + '.pdb' + + def RunLinker(flags, index, inputs, phase): """Invokes the linker and returns the stdout, returncode and target name.""" rspfile = 'part%d_%s.rsp' % (index, phase) @@ -165,6 +171,7 @@ def RunLinker(flags, index, inputs, phase): print >> f, '/ENTRY:ChromeEmptyEntry@12' print >> f, '/OUT:' + output_name print >> f, '/MANIFESTFILE:' + manifest_name + print >> f, '/PDB:' + PdbNameForIndex(index) # Log('[[[\n' + open(rspfile).read() + '\n]]]') link_exe = GetOriginalLinkerPath() popen = subprocess.Popen([link_exe, '@' + rspfile], stdout=subprocess.PIPE) |