diff options
| author | Petr Hosek <phosek@chromium.org> | 2019-04-05 19:13:54 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2019-04-05 19:13:54 +0000 |
| commit | d77fd4d4a1b46b93ae9113580a5b0f0b22635e06 (patch) | |
| tree | 972f5821c1500f60723f1cf468c41356ab129384 | |
| parent | 60d3a6224b3f68d4a42625e13f1e0dc4a803b689 (diff) | |
| download | bcm5719-llvm-d77fd4d4a1b46b93ae9113580a5b0f0b22635e06.tar.gz bcm5719-llvm-d77fd4d4a1b46b93ae9113580a5b0f0b22635e06.zip | |
[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
llvm-svn: 357798
| -rw-r--r-- | llvm/utils/gn/build/symlink_or_copy.gni | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/utils/gn/build/symlink_or_copy.gni b/llvm/utils/gn/build/symlink_or_copy.gni index 499d2e897d5..f4f45fd7abd 100644 --- a/llvm/utils/gn/build/symlink_or_copy.gni +++ b/llvm/utils/gn/build/symlink_or_copy.gni @@ -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), ] } } |
