diff options
Diffstat (limited to 'rust')
| -rw-r--r-- | rust/builder.go | 4 | ||||
| -rw-r--r-- | rust/config/global.go | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/rust/builder.go b/rust/builder.go index bea8ff717..fe2d03a0b 100644 --- a/rust/builder.go +++ b/rust/builder.go @@ -278,7 +278,9 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl if ctx.Config().IsEnvTrue("SOONG_RUSTC_INCREMENTAL") { incrementalPath := android.PathForOutput(ctx, "rustc").String() - rustcFlags = append(rustcFlags, "-Cincremental="+incrementalPath) + rustcFlags = append(rustcFlags, "-C incremental="+incrementalPath) + } else { + rustcFlags = append(rustcFlags, "-C codegen-units=1") } // Disallow experimental features diff --git a/rust/config/global.go b/rust/config/global.go index 4397d585c..b94d92fd9 100644 --- a/rust/config/global.go +++ b/rust/config/global.go @@ -44,7 +44,6 @@ var ( GlobalRustFlags = []string{ "-Z stack-protector=strong", "-Z remap-cwd-prefix=.", - "-C codegen-units=1", "-C debuginfo=2", "-C opt-level=3", "-C relocation-model=pic", @@ -55,7 +54,7 @@ var ( // This flag requires to have no space so that when it's exported to bazel // it can be removed. See aosp/2768339 "--color=always", - "-Zdylib-lto", + "-Z dylib-lto", "-Z link-native-libraries=no", } |