[llvm] 6514638 - [gn build] Remove unhelpful default for goma_dir

Nico Weber via llvm-commits llvm-commits at lists.llvm.org
Wed Dec 15 15:40:00 PST 2021


Author: Nico Weber
Date: 2021-12-15T18:39:53-05:00
New Revision: 65146382b379037f560b30ab661e28d6e00be948

URL: https://github.com/llvm/llvm-project/commit/65146382b379037f560b30ab661e28d6e00be948
DIFF: https://github.com/llvm/llvm-project/commit/65146382b379037f560b30ab661e28d6e00be948.diff

LOG: [gn build] Remove unhelpful default for goma_dir

The default hasn't worked in over 9 months now.

Getting a friendly error message if this isn't set is more useful than getting
a bad default value.

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

Added: 
    

Modified: 
    llvm/utils/gn/build/toolchain/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/build/toolchain/BUILD.gn b/llvm/utils/gn/build/toolchain/BUILD.gn
index 9819acd6a2ba..f48f25c4ca34 100644
--- a/llvm/utils/gn/build/toolchain/BUILD.gn
+++ b/llvm/utils/gn/build/toolchain/BUILD.gn
@@ -3,15 +3,11 @@ import("//llvm/utils/gn/build/toolchain/compiler.gni")
 declare_args() {
   # If is_goma is true, the location of the goma client install.
   # Set this to the output of `goma_ctl goma_dir`.
-  if (host_os == "win") {
-    goma_dir = "C:/src/goma/goma-win64"
-  } else {
-    goma_dir = getenv("HOME") + "/goma"
-  }
+  goma_dir = ""
 }
 
 assert(!use_goma || goma_dir != "",
-       "set goma_dir to the output of `goma_ctl goma_dir` in your args.gn")
+       "set `goma_dir` to the output of `goma_ctl goma_dir` in your args.gn")
 
 template("unix_toolchain") {
   toolchain(target_name) {


        


More information about the llvm-commits mailing list