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

Commit cc3ad51a authored by Yi Kong's avatar Yi Kong Committed by Gerrit Code Review
Browse files

Merge changes from topic "llvm-stable-r458507" 

* changes:
  [bindgen] Allow unrecognised -Wno-* flags on LLVM_NEXT
  Add extra cflags for LLVM_NEXT
parents 70019a90 4f664e91

cc/config/global.go

+10 −0
Original line number Diff line number Diff line
@@ -280,6 +280,11 @@ var ( 
		"-Wno-string-concatenation",

	}



	llvmNextExtraCommonGlobalCflags = []string{

		"-Wno-unqualified-std-cast-call",

		"-Wno-deprecated-non-prototype",

	}



	IllegalFlags = []string{

		"-w",

	}
@@ -361,6 +366,11 @@ func init() { 
		if ctx.Config().IsEnvTrue("USE_CCACHE") {

			flags = append(flags, "-Wno-unused-command-line-argument")

		}



		if ctx.Config().IsEnvTrue("LLVM_NEXT") {

			flags = append(flags, llvmNextExtraCommonGlobalCflags...)

		}



		return strings.Join(flags, " ")

	})

rust/bindgen.go

+5 −0
Original line number Diff line number Diff line
@@ -239,6 +239,11 @@ func (b *bindgenDecorator) GenerateSource(ctx ModuleContext, deps PathDeps) andr 
		cflags = append(cflags, "-x c")

	}



	// LLVM_NEXT may contain flags that bindgen doesn't recognise. Turn off unknown flags warning.

	if ctx.Config().IsEnvTrue("LLVM_NEXT") {

		cflags = append(cflags, "-Wno-unknown-warning-option")

	}



	outputFile := android.PathForModuleOut(ctx, b.BaseSourceProvider.getStem(ctx)+".rs")



	var cmd, cmdDesc string