• David du Colombier's avatar
    cmd/compile: fix TestAssembly on Plan 9 · e29e0ba1
    David du Colombier authored
    Since CL 23620, TestAssembly is failing on Plan 9.
    
    In CL 23620, the process environment is passed to 'go tool compile'
    after setting GOARCH. On Plan 9, if GOARCH is already set in the
    process environment, it would take precedence. On Unix, it works
    as expected because the first GOARCH found takes precedence.
    
    This change uses the mergeEnvLists function from cmd/go/main.go
    to merge the two environment lists such that variables with the
    same name in "in" replace those in "out".
    
    Change-Id: Idee22058343932ee18666dda331c562c89c33507
    Reviewed-on: https://go-review.googlesource.com/23593Reviewed-by: 's avatarIan Lance Taylor <iant@golang.org>
    Run-TryBot: David du Colombier <0intro@gmail.com>
    TryBot-Result: Gobot Gobot <gobot@golang.org>
    e29e0ba1
asm_test.go 2.95 KB