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

fix rpath for libc++

Browse Source
This commit is contained in:
Li Jie
2025-08-21 14:54:27 +08:00
parent 49e5963b0a
commit 93ca632f7a
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/crosscompile/crosscompile.go
View File

@@ -75,7 +75,7 @@ func getESPClangRoot() (clangRoot string, err error) {
return return
} }
fmt.Fprintln(os.Stderr, "ESP Clang not found in LLGO_ROOT or cache, will download.") fmt.Fprintln(os.Stderr, "ESP Clang not found in LLGO_ROOT or cache, will download.")
if err = downloadAndExtractESPClang(platformSuffix, cacheClangDir); err != nil { if err = checkDownloadAndExtractESPClang(platformSuffix, cacheClangDir); err != nil {
return return
} }
} }
@@ -130,16 +130,30 @@ func use(goos, goarch string, wasiThreads bool) (export Export, err error) {
export.CC = filepath.Join(clangRoot, "bin", "clang++") export.CC = filepath.Join(clangRoot, "bin", "clang++")
if runtime.GOOS == goos && runtime.GOARCH == goarch { if runtime.GOOS == goos && runtime.GOARCH == goarch {
clangLib := filepath.Join(clangRoot, "lib")
// not cross compile // not cross compile
// Set up basic flags for non-cross-compile // Set up basic flags for non-cross-compile
export.LDFLAGS = []string{ export.LDFLAGS = []string{
"-L" + filepath.Join(clangRoot, "lib"), "-L" + clangLib,
"-target", targetTriple, "-target", targetTriple,
"-Wno-override-module", "-Wno-override-module",
"-Wl,--error-limit=0", "-Wl,--error-limit=0",
"-fuse-ld=lld", "-fuse-ld=lld",
} }
// Add platform-specific rpath flags
switch goos {
case "darwin":
export.LDFLAGS = append(export.LDFLAGS, "-Wl,-rpath,"+clangLib)
case "linux":
export.LDFLAGS = append(export.LDFLAGS, "-Wl,-rpath,"+clangLib)
case "windows":
// Windows doesn't support rpath, DLLs should be in PATH or same directory
default:
// For other Unix-like systems, try the generic rpath
export.LDFLAGS = append(export.LDFLAGS, "-Wl,-rpath,"+clangLib)
}
// Add sysroot for macOS only // Add sysroot for macOS only
if goos == "darwin" { if goos == "darwin" {
sysrootPath, sysrootErr := getMacOSSysroot() sysrootPath, sysrootErr := getMacOSSysroot()
@@ -351,10 +365,7 @@ func useTarget(targetName string) (export Export, err error) {
if cpu != "" { if cpu != "" {
if config.Linker == "ld.lld" { if config.Linker == "ld.lld" {
ldflags = append(ldflags, "-mllvm", "-mcpu="+cpu) ldflags = append(ldflags, "-mllvm", "-mcpu="+cpu)
} } else if strings.HasPrefix(target, "i386") || strings.HasPrefix(target, "x86_64") {
// Always add CPU to CCFLAGS for proper compilation
if strings.HasPrefix(target, "i386") || strings.HasPrefix(target, "x86_64") {
ccflags = append(ccflags, "-march="+cpu) ccflags = append(ccflags, "-march="+cpu)
} else if strings.HasPrefix(target, "avr") { } else if strings.HasPrefix(target, "avr") {
ccflags = append(ccflags, "-mmcu="+cpu) ccflags = append(ccflags, "-mmcu="+cpu)