Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9948d09b authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge "Ignore variable assignments that come after a rule definition"

parents 7cb3f50f 00afd4f8

mk2rbc/mk2rbc.go

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ func (ctx *parseContext) backNode() { 


func (ctx *parseContext) handleAssignment(a *mkparser.Assignment) []starlarkNode {

	// Handle only simple variables

	if !a.Name.Const() {

	if !a.Name.Const() || a.Target != nil {

		return []starlarkNode{ctx.newBadNode(a, "Only simple variables are handled")}

	}

	name := a.Name.Strings[0]

mk2rbc/mk2rbc_test.go

+3 −1
Original line number Diff line number Diff line
@@ -1242,13 +1242,15 @@ def init(g, handle): 
		desc:   "Ignore make rules",

		mkname: "product.mk",

		in: `

foo: PRIVATE_VARIABLE = some_tool $< $@

foo: foo.c

	gcc -o $@ $*`,

		expected: `load("//build/make/core:product_config.rbc", "rblf")



def init(g, handle):

  cfg = rblf.cfg(handle)

  rblf.mk2rbc_error("product.mk:2", "unsupported line rule:       foo: foo.c\n#gcc -o $@ $*")

  rblf.mk2rbc_error("product.mk:2", "Only simple variables are handled")

  rblf.mk2rbc_error("product.mk:3", "unsupported line rule:       foo: foo.c\n#gcc -o $@ $*")

`,

	},

	{