diff options
| author | sverrir@chromium.org <sverrir@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-22 22:31:48 +0000 |
|---|---|---|
| committer | sverrir@chromium.org <sverrir@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-22 22:31:48 +0000 |
| commit | 092512aa654be9e75fbc64d1bacd33d2afd69399 (patch) | |
| tree | 63c2f114c21bf20b04ee938c2161743815ba627c /third_party | |
| parent | e6c798140918c7f2dac77528fb13ed94b14979f4 (diff) | |
| download | chromium_src-092512aa654be9e75fbc64d1bacd33d2afd69399.zip chromium_src-092512aa654be9e75fbc64d1bacd33d2afd69399.tar.gz chromium_src-092512aa654be9e75fbc64d1bacd33d2afd69399.tar.bz2 | |
Fix linker errors on Visual Studio 2008 after the tcmalloc introduction.
Minor change to Mike's suggested fix.
Review URL: http://codereview.chromium.org/92037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14257 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/tcmalloc/prep_libc.sh | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/third_party/tcmalloc/prep_libc.sh b/third_party/tcmalloc/prep_libc.sh index b3e1b82..4f0eb4d 100644 --- a/third_party/tcmalloc/prep_libc.sh +++ b/third_party/tcmalloc/prep_libc.sh @@ -18,20 +18,17 @@ OUTCMT="${2}\\libcmt.lib" mkdir $OUTDIR cp "$LIBCMT" "$OUTDIR" cp "$LIBCMTPDB" "$OUTDIR" -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\malloc.obj $OUTCMT -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\free.obj $OUTCMT -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\realloc.obj $OUTCMT -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\calloc.obj $OUTCMT -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\new.obj $OUTCMT -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\delete.obj $OUTCMT -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\new2.obj $OUTCMT -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\delete2.obj $OUTCMT -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\align.obj $OUTCMT -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\msize.obj $OUTCMT -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\heapinit.obj $OUTCMT -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\expand.obj $OUTCMT -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\heapchk.obj $OUTCMT -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\heapwalk.obj $OUTCMT -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\heapmin.obj $OUTCMT -LIB /IGNORE:4006,4221 /REMOVE:build\\intel\\mt_obj\\sbheap.obj $OUTCMT + +# We'll remove the symbols based on paths found in either the VS2005 or VS2008 +# libcmt.lib files. +LIBCMTSRCPATHVS2005="build\\intel\\mt_obj\\" +LIBCMTSRCPATHVS2008="f:\\dd\\vctools\\crt_bld\\SELF_X86\\crt\\src\\build\\INTEL\\mt_obj\\" + +OBJFILES="malloc.obj free.obj realloc.obj new.obj delete.obj new2.obj delete2.obj align.obj msize.obj heapinit.obj expand.obj heapchk.obj heapwalk.obj heapmin.obj sbheap.obj calloc.obj recalloc.obj calloc_impl.obj" + +for FILE in $OBJFILES +do + LIB /IGNORE:4006,4221 /REMOVE:${LIBCMTSRCPATHVS2005}${FILE} $OUTCMT + LIB /IGNORE:4006,4221 /REMOVE:${LIBCMTSRCPATHVS2008}${FILE} $OUTCMT +done |