Skip to content

Commit

Permalink
[gn] Rebase paths in symlink_or_copy against root_build_dir
Browse files Browse the repository at this point in the history
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

llvm-svn: 357798
  • Loading branch information
petrhosek committed Apr 5, 2019
1 parent 60d3a62 commit d77fd4d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions llvm/utils/gn/build/symlink_or_copy.gni
Expand Up @@ -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),
]
}
}

0 comments on commit d77fd4d

Please sign in to comment.