Commit e7a1cbaf authored by hans@chromium.org's avatar hans@chromium.org

Win-Clang update script: update paths for 3.6

BUG=none
NOTRY=true

Review URL: https://codereview.chromium.org/417173003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287342 0039d316-1c4b-4281-b951-d872f2087c98
parent 0db95a0e
...@@ -5417,13 +5417,13 @@ ...@@ -5417,13 +5417,13 @@
# invoked via /fallback. This is critical for using macros # invoked via /fallback. This is critical for using macros
# like ASAN_UNPOISON_MEMORY_REGION in files where we fall # like ASAN_UNPOISON_MEMORY_REGION in files where we fall
# back. # back.
'<(DEPTH)/<(make_clang_dir)/lib/clang/3.5.0/include_sanitizer', '<(DEPTH)/<(make_clang_dir)/lib/clang/3.6.0/include_sanitizer',
], ],
}, },
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalLibraryDirectories': [ 'AdditionalLibraryDirectories': [
# TODO(hans): If make_clang_dir is absolute, this breaks. # TODO(hans): If make_clang_dir is absolute, this breaks.
'<(DEPTH)/<(make_clang_dir)/lib/clang/3.5.0/lib/windows', '<(DEPTH)/<(make_clang_dir)/lib/clang/3.6.0/lib/windows',
], ],
}, },
'target_conditions': [ 'target_conditions': [
......
...@@ -152,9 +152,9 @@ def UpdateClang(): ...@@ -152,9 +152,9 @@ def UpdateClang():
# TODO(hans): Make this (and the .gypi file) version number independent. # TODO(hans): Make this (and the .gypi file) version number independent.
asan_rt_lib_src_dir = os.path.join(COMPILER_RT_BUILD_DIR, 'lib', 'clang', asan_rt_lib_src_dir = os.path.join(COMPILER_RT_BUILD_DIR, 'lib', 'clang',
'3.5.0', 'lib', 'windows') '3.6.0', 'lib', 'windows')
asan_rt_lib_dst_dir = os.path.join(LLVM_BUILD_DIR, 'lib', 'clang', asan_rt_lib_dst_dir = os.path.join(LLVM_BUILD_DIR, 'lib', 'clang',
'3.5.0', 'lib', 'windows') '3.6.0', 'lib', 'windows')
if not os.path.exists(asan_rt_lib_dst_dir): if not os.path.exists(asan_rt_lib_dst_dir):
os.makedirs(asan_rt_lib_dst_dir) os.makedirs(asan_rt_lib_dst_dir)
...@@ -168,10 +168,10 @@ def UpdateClang(): ...@@ -168,10 +168,10 @@ def UpdateClang():
# Make an extra copy of the sanitizer headers, to be put on the include path # Make an extra copy of the sanitizer headers, to be put on the include path
# of the fallback compiler. # of the fallback compiler.
sanitizer_include_dir = os.path.join(LLVM_BUILD_DIR, 'lib', 'clang', '3.5.0', sanitizer_include_dir = os.path.join(LLVM_BUILD_DIR, 'lib', 'clang', '3.6.0',
'include', 'sanitizer') 'include', 'sanitizer')
aux_sanitizer_include_dir = os.path.join(LLVM_BUILD_DIR, 'lib', 'clang', aux_sanitizer_include_dir = os.path.join(LLVM_BUILD_DIR, 'lib', 'clang',
'3.5.0', 'include_sanitizer', '3.6.0', 'include_sanitizer',
'sanitizer') 'sanitizer')
if not os.path.exists(aux_sanitizer_include_dir): if not os.path.exists(aux_sanitizer_include_dir):
os.makedirs(aux_sanitizer_include_dir) os.makedirs(aux_sanitizer_include_dir)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment