[llvm] r357798 - [gn] Rebase paths in symlink_or_copy against root_build_dir

Petr Hosek via llvm-commits llvm-commits at lists.llvm.org
Fri Apr 5 12:13:54 PDT 2019


Author: phosek
Date: Fri Apr  5 12:13:54 2019
New Revision: 357798

URL: http://llvm.org/viewvc/llvm-project?rev=357798&view=rev
Log:
[gn] Rebase paths in symlink_or_copy against root_build_dir

We should be always rebasing paths against root_build_dir which is
the directory where scripts are run from, not root_out_dir which is
the current toolchain directory. The latter can result in invalid
paths when the action is being used from a non-default toolchain.

Differential Revision: https://reviews.llvm.org/D60330

Modified:
    llvm/trunk/utils/gn/build/symlink_or_copy.gni

Modified: llvm/trunk/utils/gn/build/symlink_or_copy.gni
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/build/symlink_or_copy.gni?rev=357798&r1=357797&r2=357798&view=diff
==============================================================================
--- llvm/trunk/utils/gn/build/symlink_or_copy.gni (original)
+++ llvm/trunk/utils/gn/build/symlink_or_copy.gni Fri Apr  5 12:13:54 2019
@@ -16,9 +16,9 @@ template("symlink_or_copy") {
     script = "//llvm/utils/gn/build/symlink_or_copy.py"
     args = [
       "--stamp",
-      rebase_path(stamp, root_out_dir),
+      rebase_path(stamp, root_build_dir),
       invoker.source,
-      rebase_path(invoker.output, root_out_dir),
+      rebase_path(invoker.output, root_build_dir),
     ]
   }
 }




More information about the llvm-commits mailing list