Use prebuilt awk on Darwin too

Test: build on mac
Change-Id: I25d21c0df0b9023d6c43b11dde60e6066f107576
This commit is contained in:
Dan Willemsen 2019-02-14 20:11:26 -08:00
parent 9121973130
commit 733547d522
2 changed files with 2 additions and 7 deletions

View file

@ -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

View file

@ -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,