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

Merge pull request #1204 from visualfc/checklink

Browse Source 
internal/build: set CheckLinkArgs disable on default
This commit is contained in:
xushiwei
2025-08-07 17:17:22 +08:00
committed by GitHub
parent b03b8146df dab8379392
commit f43e2c0dee
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/build/build.go
View File

@@ -274,7 +274,8 @@ func Do(args []string, conf *Config) ([]Package, error) {
needPyInit: make(map[*packages.Package]bool), needPyInit: make(map[*packages.Package]bool),
buildConf: conf, buildConf: conf,
crossCompile: export, crossCompile: export,
isCheckEnable: IsCheckEnable(), isCheckEnabled: IsCheckEnabled(),
isCheckLinkArgsEnabled: IsCheckLinkArgsEnabled(),
} }
pkgs, err := buildAllPkgs(ctx, initial, verbose) pkgs, err := buildAllPkgs(ctx, initial, verbose)
check(err) check(err)
@@ -364,7 +365,8 @@ type context struct {
nLibdir int nLibdir int
output bool output bool
isCheckEnable bool isCheckEnabled bool
isCheckLinkArgsEnabled bool
needRt map[*packages.Package]bool needRt map[*packages.Package]bool
needPyInit map[*packages.Package]bool needPyInit map[*packages.Package]bool
@@ -463,9 +465,11 @@ func buildAllPkgs(ctx *context, initial []*packages.Package, verbose bool) (pkgs
ctx.nLibdir++ ctx.nLibdir++
} }
} }
if ctx.isCheckLinkArgsEnabled {
if err := ctx.compiler().CheckLinkArgs(pkgLinkArgs, isWasmTarget(ctx.buildConf.Goos)); err != nil { if err := ctx.compiler().CheckLinkArgs(pkgLinkArgs, isWasmTarget(ctx.buildConf.Goos)); err != nil {
panic(fmt.Sprintf("test link args '%s' failed\n\texpanded to: %v\n\tresolved to: %v\n\terror: %v", param, expdArgs, pkgLinkArgs, err)) panic(fmt.Sprintf("test link args '%s' failed\n\texpanded to: %v\n\tresolved to: %v\n\terror: %v", param, expdArgs, pkgLinkArgs, err))
} }
}
aPkg.LinkArgs = append(aPkg.LinkArgs, pkgLinkArgs...) aPkg.LinkArgs = append(aPkg.LinkArgs, pkgLinkArgs...)
} }
default: default:
@@ -838,7 +842,7 @@ func exportObject(ctx *context, pkgPath string, exportFile string, data []byte)
if err != nil { if err != nil {
return exportFile, err return exportFile, err
} }
if ctx.isCheckEnable { if ctx.isCheckEnabled {
if msg, err := llcCheck(ctx.env, f.Name()); err != nil { if msg, err := llcCheck(ctx.env, f.Name()); err != nil {
fmt.Fprintf(os.Stderr, "==> lcc %v: %v\n%v\n", pkgPath, f.Name(), msg) fmt.Fprintf(os.Stderr, "==> lcc %v: %v\n%v\n", pkgPath, f.Name(), msg)
} }
@@ -984,6 +988,7 @@ const llgoCheck = "LLGO_CHECK"
const llgoWasmRuntime = "LLGO_WASM_RUNTIME" const llgoWasmRuntime = "LLGO_WASM_RUNTIME"
const llgoWasiThreads = "LLGO_WASI_THREADS" const llgoWasiThreads = "LLGO_WASI_THREADS"
const llgoStdioNobuf = "LLGO_STDIO_NOBUF" const llgoStdioNobuf = "LLGO_STDIO_NOBUF"
const llgoCheckLinkArgs = "LLGO_CHECK_LINKARGS"
const defaultWasmRuntime = "wasmtime" const defaultWasmRuntime = "wasmtime"
@@ -1023,7 +1028,7 @@ func IsOptimizeEnabled() bool {
return isEnvOn(llgoOptimize, true) return isEnvOn(llgoOptimize, true)
} }
func IsCheckEnable() bool { func IsCheckEnabled() bool {
return isEnvOn(llgoCheck, false) return isEnvOn(llgoCheck, false)
} }
@@ -1031,6 +1036,10 @@ func IsWasiThreadsEnabled() bool {
return isEnvOn(llgoWasiThreads, true) return isEnvOn(llgoWasiThreads, true)
} }
func IsCheckLinkArgsEnabled() bool {
return isEnvOn(llgoCheckLinkArgs, false)
}
func WasmRuntime() string { func WasmRuntime() string {
return defaultEnv(llgoWasmRuntime, defaultWasmRuntime) return defaultEnv(llgoWasmRuntime, defaultWasmRuntime)
} }