StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't pass -lrt or -lgcc_s to darwin rust compiles" into main

Browse Source
This commit is contained in:
Colin Cross
2023-10-04 16:36:03 +00:00
committed by Gerrit Code Review
parent ddbfdb7f7e e18bd2097b
commit ff4d5b40ca
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rust/compiler.go
View File

@@ -327,9 +327,9 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags) Flag
flags.LinkFlags = append(flags.LinkFlags, cc.RpathFlags(ctx)...) flags.LinkFlags = append(flags.LinkFlags, cc.RpathFlags(ctx)...)
} }
if !ctx.toolchain().Bionic() && ctx.Os() != android.LinuxMusl && !ctx.Windows() { if ctx.Os() == android.Linux {
// Add -lc, -lrt, -ldl, -lpthread, -lm, -lrt and -lgcc_s to host builds to match the default behavior of device // Add -lc, -lrt, -ldl, -lpthread, -lm and -lgcc_s to glibc builds to match
// builds. This is irrelevant for the Windows target as these are Posix specific. // the default behavior of device builds.
flags.LinkFlags = append(flags.LinkFlags, flags.LinkFlags = append(flags.LinkFlags,
"-lc", "-lc",
"-lrt", "-lrt",
@@ -338,6 +338,15 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags) Flag
"-lm", "-lm",
"-lgcc_s", "-lgcc_s",
) )
} else if ctx.Os() == android.Darwin {
// Add -lc, -ldl, -lpthread and -lm to glibc darwin builds to match the default
// behavior of device builds.
flags.LinkFlags = append(flags.LinkFlags,
"-lc",
"-ldl",
"-lpthread",
"-lm",
)
} }
return flags return flags
} }