summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--DEPS5
-rw-r--r--build/common.gypi2
3 files changed, 1 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index efdfa0a..7ba84bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -242,7 +242,6 @@ v8.log
/third_party/freetype2/src
/third_party/gles2_conform
/third_party/gnu_binutils/
-/third_party/gold
/third_party/google_appengine_cloudstorage
/third_party/google_toolbox_for_mac/src
/third_party/googlemac
diff --git a/DEPS b/DEPS
index 616f52d..b0b78a0 100644
--- a/DEPS
+++ b/DEPS
@@ -466,11 +466,6 @@ deps_os = {
((Var("googlecode_url") % "linux-syscall-support") + "/trunk/lss@" +
Var("lss_revision")),
- # FIXME(mithro): src/third_party/binutils is replacing src/third_party/gold.
- # Remove gold when binutils is being used correctly.
- "src/third_party/gold":
- "/trunk/deps/third_party/gold@228995",
-
# For Linux and Chromium OS.
"src/third_party/cros_system_api":
Var("chromiumos_git") + "/platform/system_api.git" +
diff --git a/build/common.gypi b/build/common.gypi
index c707a32..8e48115 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -733,7 +733,7 @@
}],
# linux_use_gold_binary: whether to use the binary checked into
- # third_party/gold. Gold is not used for 32-bit linux builds
+ # third_party/binutils. Gold is not used for 32-bit linux builds
# as it runs out of address space.
['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', {
'linux_use_gold_binary%': 1,