| Index: tools/clang/scripts/update.py
|
| diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
|
| index 4bf1bab35f3bf899ffeb0f2c2b7dfdc500997573..aca7cb9a79c0d0e791cf2a6a835f081977488720 100755
|
| --- a/tools/clang/scripts/update.py
|
| +++ b/tools/clang/scripts/update.py
|
| @@ -301,17 +301,9 @@
|
|
|
| def UpdateClang(args):
|
| print 'Updating Clang to %s...' % PACKAGE_VERSION
|
| -
|
| - need_gold_plugin = 'LLVM_DOWNLOAD_GOLD_PLUGIN' in os.environ or (
|
| - sys.platform.startswith('linux') and
|
| - 'buildtype=Official' in os.environ.get('GYP_DEFINES', '') and
|
| - 'branding=Chrome' in os.environ.get('GYP_DEFINES', ''))
|
| -
|
| if ReadStampFile() == PACKAGE_VERSION:
|
| - print 'Clang is already up to date.'
|
| - if not need_gold_plugin or os.path.exists(
|
| - os.path.join(LLVM_BUILD_DIR, "lib/LLVMgold.so")):
|
| - return 0
|
| + print 'Already up to date.'
|
| + return 0
|
|
|
| # Reset the stamp file in case the build is unsuccessful.
|
| WriteStampFile('')
|
| @@ -339,7 +331,10 @@
|
| # Download the gold plugin if requested to by an environment variable.
|
| # This is used by the CFI ClusterFuzz bot, and it's required for official
|
| # builds on linux.
|
| - if need_gold_plugin:
|
| + if 'LLVM_DOWNLOAD_GOLD_PLUGIN' in os.environ or (
|
| + sys.platform.startswith('linux') and
|
| + 'buildtype=Official' in os.environ.get('GYP_DEFINES', '') and
|
| + 'branding=Chrome' in os.environ.get('GYP_DEFINES', '')):
|
| RunCommand(['python', CHROMIUM_DIR+'/build/download_gold_plugin.py'])
|
| WriteStampFile(PACKAGE_VERSION)
|
| return 0
|
|
|