From 860be9f0de0713150030428db44d326831ce6ad2 Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Mon, 4 Mar 2019 20:24:51 -0800
Subject: [PATCH] tools: remove fix_symlinks() function

This fixes an issue on Windows that causes build to fails when
fix_symlinks() is called concurrently with another build step.

It is also no longer necessary, since recent versions of git know how to
properly create symbolic links on checkout.
---
 tools/build.py            |  2 --
 tools/format.py           |  4 +---
 tools/setup.py            |  1 -
 tools/sync_third_party.py |  2 --
 tools/third_party.py      | 32 +-------------------------------
 website/manual.md         |  1 +
 6 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/tools/build.py b/tools/build.py
index 32d43c2ffe..e66f1f0948 100755
--- a/tools/build.py
+++ b/tools/build.py
@@ -10,8 +10,6 @@ from util import build_path, enable_ansi_colors, run
 def main(argv):
     enable_ansi_colors()
 
-    third_party.fix_symlinks()
-
     ninja_args = argv[1:]
     if not "-C" in ninja_args:
         if not os.path.isdir(build_path()):
diff --git a/tools/format.py b/tools/format.py
index 083640c227..74323708a0 100755
--- a/tools/format.py
+++ b/tools/format.py
@@ -3,12 +3,10 @@
 from glob import glob
 import os
 import sys
-from third_party import fix_symlinks, google_env, python_env
+from third_party import google_env, python_env
 from third_party import clang_format_path, third_party_path
 from util import root_path, run, find_exts, platform
 
-fix_symlinks()
-
 prettier = os.path.join(third_party_path, "node_modules", "prettier",
                         "bin-prettier.js")
 tools_path = os.path.join(root_path, "tools")
diff --git a/tools/setup.py b/tools/setup.py
index 95b3b880af..554f168466 100755
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -15,7 +15,6 @@ def main():
 
     os.chdir(root_path)
 
-    third_party.fix_symlinks()
     third_party.download_gn()
     third_party.download_clang_format()
     third_party.download_clang()
diff --git a/tools/sync_third_party.py b/tools/sync_third_party.py
index f3c254901a..8557c7b58c 100755
--- a/tools/sync_third_party.py
+++ b/tools/sync_third_party.py
@@ -11,8 +11,6 @@ import util
 
 util.enable_ansi_colors()
 
-third_party.fix_symlinks()
-
 third_party.run_yarn()
 third_party.run_cargo()
 third_party.run_pip()
diff --git a/tools/third_party.py b/tools/third_party.py
index e08e8307d7..133f265c2c 100644
--- a/tools/third_party.py
+++ b/tools/third_party.py
@@ -6,8 +6,7 @@ import os
 import site
 import sys
 from os import path
-from util import add_env_path, find_exts, make_env, remove_and_symlink, rmtree
-from util import root_path, run
+from util import add_env_path, find_exts, make_env, rmtree, root_path, run
 from tempfile import mkdtemp
 
 
@@ -89,35 +88,6 @@ def google_env(env=None, merge_env=None, depot_tools_path_=depot_tools_path):
     return env
 
 
-def fix_symlinks():
-    # Ensure the third_party directory exists.
-    try:
-        os.makedirs(third_party_path)
-    except OSError:
-        pass
-
-    # Make symlinks to Yarn metadata living in the root repo.
-    remove_and_symlink("../package.json", tp("package.json"))
-
-    # TODO(ry) Is it possible to remove these symlinks?
-    remove_and_symlink("v8/third_party/googletest", tp("googletest"), True)
-    remove_and_symlink("v8/third_party/jinja2", tp("jinja2"), True)
-    remove_and_symlink("v8/third_party/llvm-build", tp("llvm-build"), True)
-    remove_and_symlink("v8/third_party/markupsafe", tp("markupsafe"), True)
-    remove_and_symlink("../../build", tp("v8/build"), True)
-
-    # On Windows, git doesn't create the right type of symlink if the symlink
-    # and it's target are in different repos. Here we fix the symlinks that
-    # exist in the root repo while their target is in the third_party repo.
-    remove_and_symlink("third_party/node_modules", root("node_modules"), True)
-    remove_and_symlink("third_party/v8/buildtools", root("buildtools"), True)
-    remove_and_symlink("third_party/v8/build_overrides",
-                       root("build_overrides"), True)
-    remove_and_symlink("third_party/v8/testing", root("testing"), True)
-    remove_and_symlink("../third_party/v8/tools/clang", root("tools/clang"),
-                       True)
-
-
 # Run Yarn to install JavaScript dependencies.
 def run_yarn():
     run(["yarn", "install"], cwd=third_party_path)
diff --git a/website/manual.md b/website/manual.md
index f16fa4345a..acb2396043 100644
--- a/website/manual.md
+++ b/website/manual.md
@@ -167,6 +167,7 @@ Extra steps for Windows users:
    `Programs and Features` → Select
    `Windows Software Development Kit - Windows 10` → `Change` → `Change` → Check
    `Debugging Tools For Windows` → `Change` -> `Finish`.
+4. Make sure you are using git version 2.19.2.windows.1 or newer.
 
 #### Other useful commands