add expandCfgByName

tsingbx · Dec 11, 2024 · efb61e3 · efb61e3
1 parent a5ec323
commit efb61e3
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/cmd/llcppcfg/llcppgcfg/cfg.go b/cmd/llcppcfg/llcppgcfg/cfg.go
@@ -82,11 +82,11 @@ func doExpandCflags(str string, fn func(s string) bool) ([]string, string) {
 			}
 			_, ok := contains[path]
 			if !ok {
-				relPath, err := filepath.Rel(trimStr, path)
-				if err == nil {
+				relPath, errRel := filepath.Rel(trimStr, path)
+				if errRel == nil {
 					contains[path] = relPath
 				} else {
-					panic(err)
+					return errRel
 				}
 			}
 			return nil
@@ -138,6 +138,15 @@ func ExpandCFlagsName(name string) ([]string, string) {
 	return ExpandCflags(originCFlags)
 }
 
+func expandCFlagsAndLibs(name string, cfg *LLCppConfig) {
+	cfg.Include, cfg.CFlags = ExpandCFlagsName(name)
+	cfg.Libs = ExpandLibsName(name)
+}
+
+func fillCfgInclude(name string, cfg *LLCppConfig) {
+	cfg.Include, _ = ExpandCFlagsName(name)
+}
+
 func NewLLCppConfig(name string, isCpp bool, expand bool) *LLCppConfig {
 	cfg := &LLCppConfig{
 		Name: name,
@@ -147,12 +156,12 @@ 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
+		expandCFlagsAndLibs(name, cfg)
+	} else {
+		fillCfgInclude(name, cfg)
 	}
-	cfg.Include, _ = ExpandCFlagsName(name)
 	return cfg
 }