add expandCfgByName

tsingbx · Dec 11, 2024 · 3fc0216 · 3fc0216
1 parent a5ec323
commit 3fc0216
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/cmd/llcppcfg/llcppgcfg/cfg.go b/cmd/llcppcfg/llcppgcfg/cfg.go
@@ -138,6 +138,11 @@ func ExpandCFlagsName(name string) ([]string, string) {
 	return ExpandCflags(originCFlags)
 }
 
+func expandCfgByName(name string, cfg *LLCppConfig) {
+	cfg.Include, cfg.CFlags = ExpandCFlagsName(name)
+	cfg.Libs = ExpandLibsName(name)
+}
+
 func NewLLCppConfig(name string, isCpp bool, expand bool) *LLCppConfig {
 	cfg := &LLCppConfig{
 		Name: name,
@@ -147,12 +152,10 @@ func NewLLCppConfig(name string, isCpp bool, expand bool) *LLCppConfig {
 	cfg.TrimPrefixes = []string{}
 	cfg.Cplusplus = isCpp
 	cfg.Include = []string{}
+	cfg.Include, _ = ExpandCFlagsName(name)
 	if expand {
-		cfg.Include, cfg.CFlags = ExpandCFlagsName(name)
-		cfg.Libs = ExpandLibsName(name)
-		return cfg
+		expandCfgByName(name, cfg)
 	}
-	cfg.Include, _ = ExpandCFlagsName(name)
 	return cfg
 }