Merge "Don't pass -lrt or -lgcc_s to darwin rust compiles" into main (ff4d5b40) · Commits · e / os / android_build_soong

rust/compiler.go

+12 −3

Original line number	Diff line number	Diff line
		@@ -327,9 +327,9 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags) Flag
		flags.LinkFlags = append(flags.LinkFlags, cc.RpathFlags(ctx)...)
		}

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