Commit 1ec92070 authored by machenbach's avatar machenbach Committed by Commit bot

Revert of Automatically download gold plugin for cfi builds. (patchset #1 id:1...

Revert of Automatically download gold plugin for cfi builds. (patchset #1 id:1 of https://codereview.chromium.org/1303183005/ )

Reason for revert:
Breaks windows.

Original issue's description:
> Automatically download gold plugin for cfi builds.
>
> BUG=chromium:515782
> LOG=n
> NOTRY=true
>
> Committed: https://crrev.com/c8dbd2c477c47a34593a0e7deee55915425b4ac2
> Cr-Commit-Position: refs/heads/master@{#30556}

TBR=bmeurer@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:515782

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

Cr-Commit-Position: refs/heads/master@{#30558}
parent 72bc4b5c
...@@ -102,13 +102,6 @@ hooks = [ ...@@ -102,13 +102,6 @@ hooks = [
'v8/third_party/binutils/download.py', 'v8/third_party/binutils/download.py',
], ],
}, },
{
# Pull gold plugin if needed or requested via GYP_DEFINES.
# Note: This must run before the clang update.
'name': 'gold_plugin',
'pattern': '.',
'action': ['python', 'v8/build/download_gold_plugin.py'],
},
{ {
# Pull clang if needed or requested via GYP_DEFINES. # Pull clang if needed or requested via GYP_DEFINES.
# Note: On Win, this should run after win_toolchain, as it may use it. # Note: On Win, this should run after win_toolchain, as it may use it.
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
import json import json
import os import os
import re
import shutil import shutil
import subprocess import subprocess
import sys import sys
...@@ -31,24 +30,7 @@ CLANG_REVISION = os.popen(CLANG_UPDATE_PY + ' --print-revision').read().rstrip() ...@@ -31,24 +30,7 @@ CLANG_REVISION = os.popen(CLANG_UPDATE_PY + ' --print-revision').read().rstrip()
CLANG_BUCKET = 'gs://chromium-browser-clang/Linux_x64' CLANG_BUCKET = 'gs://chromium-browser-clang/Linux_x64'
GOLD_PLUGIN_PATH = os.path.join(LLVM_BUILD_PATH, 'lib', 'LLVMgold.so')
sys.path.insert(0, os.path.join(CHROME_SRC, 'tools', 'clang', 'scripts'))
import update
def main(): def main():
if not re.search(r'cfi_vptr=1', os.environ.get('GYP_DEFINES', '')):
# Bailout if this is not a cfi build.
print 'Skipping gold plugin download for non-cfi build.'
return 0
if (os.path.exists(GOLD_PLUGIN_PATH) and
update.ReadStampFile().strip() == update.PACKAGE_VERSION):
# Bailout if clang is up-to-date. This requires the script to be run before
# the clang update step! I.e. afterwards clang would always be up-to-date.
print 'Skipping gold plugin download. File present and clang up to date.'
return 0
targz_name = 'llvmgold-%s.tgz' % CLANG_REVISION targz_name = 'llvmgold-%s.tgz' % CLANG_REVISION
remote_path = '%s/%s' % (CLANG_BUCKET, targz_name) remote_path = '%s/%s' % (CLANG_BUCKET, targz_name)
......
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