commit 182557dca73c8a143404680d9c05aefc98b69dde
author hashimoto <hashimoto@chromium.org> Wed Feb 17 12:39:02 2016 -0800
committer Commit bot <commit-bot@chromium.org> Wed Feb 17 20:40:32 2016 +0000
tree 4b69596c06b642ab180a373a8920774e3d169d09
parent 75c052e3167a80d1d2bc2f2e521c7012bba2e4ca

GN: Normalize the build directory path

BUG=586906
TEST=ln -s /tmp out_tmp && out/gn/gn gen out_tmp/Release

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

Cr-Original-Commit-Position: refs/heads/master@{#375970}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 89d33db3bfd53fbb3d85bb218ad4db8489a4dc34

tools/gn/setup.cc

diff --git a/tools/gn/setup.cc b/tools/gn/setup.cc
index 79814e6..831e4e4 100644
--- a/tools/gn/setup.cc
+++ b/tools/gn/setup.cc
@@ -521,10 +521,23 @@
 }
 
 bool Setup::FillBuildDir(const std::string& build_dir, bool require_exists) {
+#if defined(OS_POSIX)
+  // Expand all ./, ../, and symbolic links in build_dir.
+  char realpath_buf[PATH_MAX];
+  if (!realpath(build_dir.c_str(), realpath_buf)) {
+    Err(Location(), "Can't normalize the build directory path.",
+        strerror(errno)) .PrintToStdout();
+    return false;
+  }
+  const std::string build_dir_realpath = realpath_buf;
+#else
+  const std::string& build_dir_realpath = build_dir;
+#endif
+
   Err err;
   SourceDir resolved =
       SourceDirForCurrentDirectory(build_settings_.root_path()).
-    ResolveRelativeDir(Value(nullptr, build_dir), &err,
+    ResolveRelativeDir(Value(nullptr, build_dir_realpath), &err,
         build_settings_.root_path_utf8());
   if (err.has_error()) {
     err.PrintToStdout();