diff options
| author | bungeman@chromium.org <bungeman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 14:43:21 +0000 |
|---|---|---|
| committer | bungeman@chromium.org <bungeman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 14:43:21 +0000 |
| commit | 190c0e682f69797ff488d794c76db93bb258067e (patch) | |
| tree | 7b2224733345c6f7736f384bbd19143db83d92c7 /base/allocator | |
| parent | 7516fb79a1f1756cfdad63ae9cb424d4bfcaede2 (diff) | |
| download | chromium_src-190c0e682f69797ff488d794c76db93bb258067e.zip chromium_src-190c0e682f69797ff488d794c76db93bb258067e.tar.gz chromium_src-190c0e682f69797ff488d794c76db93bb258067e.tar.bz2 | |
Update prep_libc.py for new libcmt.lib layout.
The libcmt.lib that comes with Visual Studio 2012 places symbols into more focused namespaces like nativec and nativecpp.
This change fixes the static library build linker errors like 'allocator.lib(allocator_shim.obj) : error LNK2005'.
Review URL: https://codereview.chromium.org/11360035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/allocator')
| -rwxr-xr-x | base/allocator/prep_libc.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/base/allocator/prep_libc.py b/base/allocator/prep_libc.py index 7390356..be7030f 100755 --- a/base/allocator/prep_libc.py +++ b/base/allocator/prep_libc.py @@ -39,7 +39,9 @@ def main(): os.path.join(outdir, 'libcmt.pdb')) vspaths = [ 'build\\intel\\mt_obj\\', - 'f:\\dd\\vctools\\crt_bld\\SELF_X86\\crt\\src\\build\\INTEL\\mt_obj\\' + 'f:\\dd\\vctools\\crt_bld\\SELF_X86\\crt\\src\\build\\INTEL\\mt_obj\\', + 'F:\\dd\\vctools\\crt_bld\\SELF_X86\\crt\\src\\build\\INTEL\\mt_obj\\nativec\\\\', + 'F:\\dd\\vctools\\crt_bld\\SELF_X86\\crt\\src\\build\\INTEL\\mt_obj\\nativecpp\\\\', ] objfiles = ['malloc', 'free', 'realloc', 'new', 'delete', 'new2', 'delete2', 'align', 'msize', 'heapinit', 'expand', 'heapchk', 'heapwalk', |