@@ -44,7 +44,6 @@ import (
44
44
"github.com/goplus/llgo/compiler/internal/mockable"
45
45
"github.com/goplus/llgo/compiler/internal/mod"
46
46
"github.com/goplus/llgo/compiler/internal/packages"
47
- "github.com/goplus/llgo/compiler/internal/pc"
48
47
"github.com/goplus/llgo/compiler/internal/typepatch"
49
48
"github.com/goplus/llgo/compiler/ssa/abi"
50
49
xenv "github.com/goplus/llgo/xtool/env"
@@ -308,22 +307,19 @@ type context struct {
308
307
// the pc for the deps of each package should be unique
309
308
// consider duplicate clib but different version
310
309
// exmaple: A requires zlib/1.3.1, B requires zlib/1.3.0
311
- func setDepsPC (ctx * context , p * packages.Package ) {
310
+ func setDepsPC (ctx * context , pkg * packages.Package ) {
312
311
var pcDir []string
313
- for _ , pkg := range p .Imports {
314
- if ! isLLPkg (pkg ) {
315
- continue
316
- }
317
- ver := module.Version {
318
- Path : pkg .Module .Path ,
319
- Version : pkg .Module .Version ,
320
- }
321
- if dir := ctx .llpkgMod [ver ]; dir != "" {
322
- pcDir = append (pcDir , dir )
323
- }
312
+ ver := module.Version {
313
+ Path : pkg .Module .Path ,
314
+ Version : pkg .Module .Version ,
324
315
}
316
+ if dir := ctx .llpkgMod [ver ]; dir != "" {
317
+ pcDir = append (pcDir , dir )
318
+ }
319
+
325
320
if len (pcDir ) > 0 {
326
- os .Setenv ("PKG_CONFIG_PATH" , pc .AppendPCPath (strings .Join (pcDir , ":" )))
321
+ pcDir = append (pcDir , os .Getenv ("PKG_CONFIG_PATH" ))
322
+ os .Setenv ("PKG_CONFIG_PATH" , strings .Join (pcDir , ":" ))
327
323
}
328
324
}
329
325
@@ -348,7 +344,9 @@ func buildAllPkgs(ctx *context, initial []*packages.Package, verbose bool) (pkgs
348
344
}
349
345
built [pkg .ID ] = none {}
350
346
351
- setDepsPC (ctx , pkg )
347
+ if isLLPkg (pkg ) {
348
+ setDepsPC (ctx , pkg )
349
+ }
352
350
353
351
switch kind , param := cl .PkgKindOf (pkg .Types ); kind {
354
352
case cl .PkgDeclOnly :
0 commit comments