From 22a43622a02b8b024243a63e95ef33277e844ab6 Mon Sep 17 00:00:00 2001
From: Li Jie <cpunion@gmail.com>
Date: Fri, 14 Nov 2025 15:20:24 +0800
Subject: [PATCH] cl: fix global var rewrite in alt pkg

---
 cl/compile.go           | 7 ++++++-
 internal/build/build.go | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cl/compile.go b/cl/compile.go
index d239bb07..2b3366bb 100644
--- a/cl/compile.go
+++ b/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
 }
 
diff --git a/internal/build/build.go b/internal/build/build.go
index 5faca519..c71b8645 100644
--- a/internal/build/build.go
+++ b/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
 			}
 		}
 	}