cl: fix global var rewrite in alt pkg

cl/compile.go

@@ -134,7 +134,12 @@ func (p *context) rewriteValue(name string) (string, bool) {
 	if p.rewrites == nil {
 		return "", false
 	}
-	val, ok := p.rewrites[name]
+	dot := strings.LastIndex(name, ".")
+	if dot < 0 {
+		return "", false
+	}
+	varName := name[dot+1:]
+	val, ok := p.rewrites[varName]
 	return val, ok
 }
 

internal/build/build.go

@@ -350,7 +350,6 @@ func Do(args []string, conf *Config) ([]Package, error) {
 		}
 		return nil, fmt.Errorf("initial package not found")
 	}
-
 	dpkg, err := buildAllPkgs(ctx, altPkgs[noRt:], verbose)
 	check(err)
 	allPkgs := append([]*aPackage{}, pkgs...)
@@ -1190,7 +1189,7 @@ func collectRewriteVars(ctx *context, pkgPath string) map[string]string {
 				if rewrites == nil {
 					rewrites = make(map[string]string)
 				}
-				rewrites[pkgPath+"."+name] = value
+				rewrites[name] = value
 			}
 		}
 	}