Skip to content

Commit

Permalink
diagnose-me: Deweirdify gold checks.
Browse files Browse the repository at this point in the history
/usr/bin/ld.gold pointing to gold seems harmless, so allow it.
Don't complain about the existence of /usr/local/gold, as users
might have gold there for non-chrome projects.

BUG=none
TEST=script passes on my machine
NOTRY=true

Review URL: http://codereview.chromium.org/9413010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122305 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
thakis@chromium.org committed Feb 16, 2012
1 parent 5fd0532 commit 9074068
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions tools/diagnose-me.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ def CheckPathLd():
return None


@Check("/usr/local/gold is cleaned up")
@Check("/usr/bin/ld doesn't point to gold")
def CheckLocalGold():
# Check /usr/bin/ld* symlinks.
for path in ('ld.bfd', 'ld.gold', 'ld'):
for path in ('ld.bfd', 'ld'):
path = '/usr/bin/' + path
try:
target = os.readlink(path)
Expand All @@ -64,11 +64,6 @@ def CheckLocalGold():
"/usr/bin/ld be the standard linker, which you likely\n"
"renamed /usr/bin/ld.bfd or something like that.\n" % path)

if os.path.exists('/usr/local/gold'):
return ("You have a /usr/local/gold, which is no longer needed.\n"
"Check that you don't have any references to it in your\n"
"set up and then delete it.\n")

return None


Expand Down

0 comments on commit 9074068

Please sign in to comment.