[PATCH] D56427: gn build: s/root_out_dir/root_build_dir/g in include/llvm/Config/BUILD.gn.

[Peter Collingbourne via Phabricator via llvm-commits]

pcc created this revision.
pcc added reviewers: thakis, phosek.

This makes the generated files go to the right place when using a non-default toolchain.


Repository:
  rL LLVM

https://reviews.llvm.org/D56427

Files:
  llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn


Index: llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+++ llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
@@ -54,9 +54,9 @@
   ]
   args = [
     "-o",
-    rebase_path(outputs[0], root_out_dir),
+    rebase_path(outputs[0], root_build_dir),
 
-    rebase_path(sources[0], root_out_dir),
+    rebase_path(sources[0], root_build_dir),
   ]
 
   if (llvm_enable_abi_breaking_checks) {
@@ -87,8 +87,8 @@
   ]
   args = [
     "-o",
-    rebase_path(outputs[0], root_out_dir),
-    rebase_path(sources[0], root_out_dir),
+    rebase_path(outputs[0], root_build_dir),
+    rebase_path(sources[0], root_build_dir),
 
     "BUG_REPORT_URL=https://bugs.llvm.org/",
     "ENABLE_BACKTRACES=1",
@@ -333,8 +333,8 @@
   ]
   args = [
     "-o",
-    rebase_path(outputs[0], root_out_dir),
-    rebase_path(sources[0], root_out_dir),
+    rebase_path(outputs[0], root_build_dir),
+    rebase_path(sources[0], root_build_dir),
 
     "LLVM_ENABLE_DUMP=",
     "LINK_POLLY_INTO_TOOLS=",
@@ -399,8 +399,8 @@
     }
     args = [
       "-o",
-      rebase_path(outputs[0], root_out_dir),
-      rebase_path(sources[0], root_out_dir),
+      rebase_path(outputs[0], root_build_dir),
+      rebase_path(sources[0], root_build_dir),
       "${invoker.key}=$value",
     ]
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D56427.180605.patch
Type: text/x-patch
Size: 1409 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190108/5dac6a13/attachment.bin>