Merge pull request #1437 from goplus/xgopilot/claude/issue-1436-1764823116

Add -a flag to llgo build to force package rebuilds

Author: xushiwei

cmd/internal/base/pass.go

@@ -72,7 +72,7 @@ func NewPassArgs(flag *flag.FlagSet) *PassArgs {
 func PassBuildFlags(cmd *Command) *PassArgs {
 	p := NewPassArgs(&cmd.Flag)
 	p.Bool("n", "x")
-	p.Bool("a")
+	// Note: "a" flag removed - now handled by flags.AddBuildFlags()
 	p.Bool("linkshared", "race", "msan", "asan",
 		"trimpath", "work")
 	p.Var("p", "asmflags", "compiler",

cmd/internal/flags/flags.go

@@ -39,12 +39,14 @@ var ForceEspClang bool
 var SizeReport bool
 var SizeFormat string
 var SizeLevel string
+var ForceRebuild bool
 
 func AddCommonFlags(fs *flag.FlagSet) {
 	fs.BoolVar(&Verbose, "v", false, "Verbose output")
 }
 
 func AddBuildFlags(fs *flag.FlagSet) {
+	fs.BoolVar(&ForceRebuild, "a", false, "Force rebuilding of packages that are already up-to-date")
 	fs.StringVar(&Tags, "tags", "", "Build tags")
 	fs.StringVar(&BuildEnv, "buildenv", "", "Build environment")
 	if buildenv.Dev {
@@ -86,6 +88,7 @@ func UpdateConfig(conf *build.Config) error {
 	conf.Target = Target
 	conf.Port = Port
 	conf.BaudRate = BaudRate
+	conf.ForceRebuild = ForceRebuild
 	if SizeReport || SizeFormat != "" || SizeLevel != "" {
 		conf.SizeReport = true
 		if SizeFormat != "" {

internal/build/build.go

@@ -132,6 +132,7 @@ type Config struct {
 	CheckLLFiles  bool // check .ll files valid
 	CheckLinkArgs bool // check linkargs valid
 	ForceEspClang bool // force to use esp-clang
+	ForceRebuild  bool // force rebuilding of packages that are already up-to-date
 	Tags          string
 	SizeReport    bool   // print size report after successful build
 	SizeFormat    string // size report format: text,json (default text)

internal/build/collect.go

@@ -309,6 +309,11 @@ func (c *context) tryLoadFromCache(pkg *aPackage) bool {
 		return false
 	}
 
+	// Skip cache when force rebuild is enabled
+	if c.buildConf.ForceRebuild {
+		return false
+	}
+
 	if pkg.Fingerprint == "" {
 		return false
 	}

internal/build/collect_test.go

@@ -378,6 +378,82 @@ func TestTryLoadFromCache_NoFingerprint(t *testing.T) {
 	}
 }
 
+func TestTryLoadFromCache_ForceRebuild(t *testing.T) {
+	td := t.TempDir()
+	oldFunc := cacheRootFunc
+	cacheRootFunc = func() string { return td }
+	defer func() { cacheRootFunc = oldFunc }()
+
+	ctx := &context{
+		conf: &packages.Config{},
+		buildConf: &Config{
+			Goos:         "darwin",
+			Goarch:       "arm64",
+			ForceRebuild: true, // Force rebuild enabled
+		},
+		crossCompile: crosscompile.Export{
+			LLVMTarget: "arm64-apple-darwin",
+		},
+	}
+
+	// Create a fake cache entry
+	pkg := &aPackage{
+		Package: &packages.Package{
+			PkgPath: "example.com/cached",
+			Name:    "cached",
+		},
+		Fingerprint: "test123",
+		Manifest: func() string {
+			m := newManifestBuilder()
+			m.env.Goos = "darwin"
+			m.pkg.PkgPath = "example.com/cached"
+			return m.Build()
+		}(),
+	}
+
+	// Create a temporary .o file
+	objFile, err := os.CreateTemp(td, "test-*.o")
+	if err != nil {
+		t.Fatalf("CreateTemp: %v", err)
+	}
+	objFile.WriteString("fake object file")
+	objFile.Close()
+
+	pkg.LLFiles = []string{objFile.Name()}
+
+	// First save to cache
+	ctx.buildConf.ForceRebuild = false
+	if err := ctx.saveToCache(pkg); err != nil {
+		t.Fatalf("saveToCache: %v", err)
+	}
+
+	// Verify cache exists
+	cm := ctx.ensureCacheManager()
+	paths := cm.PackagePaths("arm64-apple-darwin", "example.com/cached", "test123")
+	if _, err := os.Stat(paths.Archive); err != nil {
+		t.Fatalf("cache should exist: %v", err)
+	}
+
+	// Now enable ForceRebuild and try to load
+	ctx.buildConf.ForceRebuild = true
+
+	// Clear LLFiles to verify it's not loaded from cache
+	pkg.LLFiles = nil
+	pkg.CacheHit = false
+
+	if ctx.tryLoadFromCache(pkg) {
+		t.Error("should return false when ForceRebuild is enabled, even with valid cache")
+	}
+
+	if pkg.CacheHit {
+		t.Error("CacheHit should remain false when ForceRebuild is enabled")
+	}
+
+	if len(pkg.LLFiles) > 0 {
+		t.Error("LLFiles should not be populated when ForceRebuild is enabled")
+	}
+}
+
 func TestSaveToCache_MainPackage(t *testing.T) {
 	td := t.TempDir()
 	oldFunc := cacheRootFunc