diff options
author | Lukacs T. Berki <lberki@google.com> | 2021-03-11 08:52:39 +0100 |
---|---|---|
committer | Lukacs T. Berki <lberki@google.com> | 2021-03-11 08:52:39 +0100 |
commit | 21d5c7aaa9e36ad80efbbbd573d627435984817c (patch) | |
tree | 7b9cf2bfe6cff3b333d660ee0a13a73cb09cffe2 /ui | |
parent | dfa33be445c454c1fc59bfd009907499cbaad0d7 (diff) | |
download | soong-21d5c7aaa9e36ad80efbbbd573d627435984817c.tar.gz |
Hard-wire the path to xcrun as /usr/bin/xcrun.
This lets us not leak $PATH to soong_build. It was only needed for
Darwin tests anyway.
Test: Will ask jingwen@ who has a Mac.
Change-Id: I4647e41275b323fe6283580f8f92718c6229f23e
Diffstat (limited to 'ui')
-rw-r--r-- | ui/build/soong.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ui/build/soong.go b/ui/build/soong.go index 500abdac5..884e95741 100644 --- a/ui/build/soong.go +++ b/ui/build/soong.go @@ -177,14 +177,6 @@ func runSoong(ctx Context, config Config) { ninjaEnv.Set("TOP", os.Getenv("TOP")) ninjaEnv.Set("SOONG_OUTDIR", config.SoongOutDir()) - // Needed for NonHermeticHostSystemTool() and that, only in tests. We should - // probably find a better way of running tests other than making $PATH - // available also to production builds. Note that this is not get same as - // os.Getenv("PATH"): config.Environment() contains the $PATH that redirects - // every binary through the path interposer. - configPath, _ := config.Environment().Get("PATH") - ninjaEnv.Set("PATH", configPath) - // For debugging if os.Getenv("SOONG_DELVE") != "" { ninjaEnv.Set("SOONG_DELVE", os.Getenv("SOONG_DELVE")) |