Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4acd66ae authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Switch back to llvm-ar (with crsD flags only)."

parents f3768f50 f1addebb

cc/builder.go

+5 −2
Original line number Diff line number Diff line
@@ -508,8 +508,11 @@ func TransformObjToStaticLib(ctx android.ModuleContext, objFiles android.Paths, 
		return

	}



	arCmd := gccCmd(flags.toolchain, "ar")

	arFlags := "crsPD"

	arCmd := "${config.ClangBin}/llvm-ar"

	arFlags := "crsD"

	if !ctx.Darwin() {

		arFlags += " -format=gnu"

	}

	if flags.arFlags != "" {

		arFlags += " " + flags.arFlags

	}

cc/makevars.go

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, 
	if target.Os == android.Darwin {

		ctx.Strict(makePrefix+"AR", "${config.MacArPath}")

	} else {

		ctx.Strict(makePrefix+"AR", gccCmd(toolchain, "ar"))

		ctx.Strict(makePrefix+"AR", "${config.ClangBin}/llvm-ar")

		ctx.Strict(makePrefix+"READELF", gccCmd(toolchain, "readelf"))

		ctx.Strict(makePrefix+"NM", gccCmd(toolchain, "nm"))

	}