admin/llgo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1245 from luoliwoshang/llgo/targetsdir

Browse Source 
internal/target:read targets consist use LLGoROOT
This commit is contained in:
xushiwei
2025-08-28 11:48:48 +08:00
committed by GitHub
parent 6144987f06 b68686e542
commit 71353baf59
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/targets/resolver.go
View File

@@ -3,7 +3,8 @@ package targets
import ( import (
"fmt" "fmt"
"path/filepath" "path/filepath"
"runtime"
"github.com/goplus/llgo/internal/env"
) )
// Resolver provides high-level interface for target configuration resolution // Resolver provides high-level interface for target configuration resolution
@@ -20,10 +21,8 @@ func NewResolver(targetsDir string) *Resolver {
// NewDefaultResolver creates a resolver with default targets directory // NewDefaultResolver creates a resolver with default targets directory
func NewDefaultResolver() *Resolver { func NewDefaultResolver() *Resolver {
// Assume targets directory is relative to this package llgoRoot := env.LLGoROOT()
_, filename, _, _ := runtime.Caller(0) targetsDir := filepath.Join(llgoRoot, "targets")
projectRoot := filepath.Dir(filepath.Dir(filepath.Dir(filename)))
targetsDir := filepath.Join(projectRoot, "targets")
return NewResolver(targetsDir) return NewResolver(targetsDir)
} }