openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use prebuilt m4 for bison too 

Bison is currently looking for m4 directly in `/usr/bin/m4`, instead of
through $PATH, so it hadn't been tracked via the $PATH interposer
checks. But if you don't install m4 at all, it starts failing.

Bug: 117561006
Bug: 130111713
Test: Run on a machine without m4, build passes
Change-Id: I3fbad64127c183de79c17511e979fd5df946eb80
This commit is contained in:
Dan Willemsen 2019-06-25 16:05:36 -07:00
parent 50c744e916
commit c4a6aa83e8
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cc/gen.go
View File

@ -98,6 +98,7 @@ func genYacc(ctx android.ModuleContext, rule *android.RuleBuilder, yaccFile andr
} }
cmd.Text("BISON_PKGDATADIR=prebuilts/build-tools/common/bison"). cmd.Text("BISON_PKGDATADIR=prebuilts/build-tools/common/bison").
FlagWithInput("M4=", ctx.Config().PrebuiltBuildTool(ctx, "m4")).
Tool(ctx.Config().PrebuiltBuildTool(ctx, "bison")). Tool(ctx.Config().PrebuiltBuildTool(ctx, "bison")).
Flag("-d"). Flag("-d").
Flags(flags). Flags(flags).