diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2019-02-14 20:11:26 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2019-02-14 20:11:26 -0800 |
| commit | 733547d5228dd7ddad49864664d6f7565282108d (patch) | |
| tree | 11495775fbc7fa010115dcb8425c9f4f929e02be /ui | |
| parent | 91219731308116f8ace04176f80e31656df593e0 (diff) | |
| download | build_soong-733547d5228dd7ddad49864664d6f7565282108d.tar.gz build_soong-733547d5228dd7ddad49864664d6f7565282108d.tar.bz2 build_soong-733547d5228dd7ddad49864664d6f7565282108d.zip | |
Use prebuilt awk on Darwin too
Test: build on mac
Change-Id: I25d21c0df0b9023d6c43b11dde60e6066f107576
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/build/path.go | 6 | ||||
| -rw-r--r-- | ui/build/paths/config.go | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/ui/build/path.go b/ui/build/path.go index 52941335..0e1c02ca 100644 --- a/ui/build/path.go +++ b/ui/build/path.go @@ -149,10 +149,8 @@ func SetupPath(ctx Context, config Config) { // We put some prebuilts in $PATH, since it's infeasible to add dependencies for all of // them. - if runtime.GOOS == "linux" { - prebuiltsPath, _ := filepath.Abs("prebuilts/build-tools/path/" + runtime.GOOS + "-x86") - myPath = prebuiltsPath + string(os.PathListSeparator) + myPath - } + prebuiltsPath, _ := filepath.Abs("prebuilts/build-tools/path/" + runtime.GOOS + "-x86") + myPath = prebuiltsPath + string(os.PathListSeparator) + myPath config.Environment().Set("PATH", myPath) config.pathReplaced = true diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go index b20f37c4..6ef7fe92 100644 --- a/ui/build/paths/config.go +++ b/ui/build/paths/config.go @@ -125,9 +125,6 @@ var Configuration = map[string]PathConfig{ "ld.gold": Forbidden, "pkg-config": Forbidden, - // On Linux we'll use one-true-awk instead. - "awk": LinuxOnlyPrebuilt, - // On Linux we'll use the toybox versions of these instead. "basename": LinuxOnlyPrebuilt, "cat": LinuxOnlyPrebuilt, |