diff options
Diffstat (limited to 'cc/makevars.go')
| -rw-r--r-- | cc/makevars.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/makevars.go b/cc/makevars.go index a1e97a51..2a5c8137 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -59,12 +59,12 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("BOARD_VNDK_VERSION", "") } - ctx.Strict("ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS", asanCflags) - ctx.Strict("ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS", asanLdflags) - ctx.Strict("ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES", asanLibs) + ctx.Strict("ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS", strings.Join(asanCflags, " ")) + ctx.Strict("ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS", strings.Join(asanLdflags, " ")) + ctx.Strict("ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES", strings.Join(asanLibs, " ")) - ctx.Strict("CFI_EXTRA_CFLAGS", cfiCflags) - ctx.Strict("CFI_EXTRA_LDFLAGS", cfiLdflags) + ctx.Strict("CFI_EXTRA_CFLAGS", strings.Join(cfiCflags, " ")) + ctx.Strict("CFI_EXTRA_LDFLAGS", strings.Join(cfiLdflags, " ")) ctx.Strict("DEFAULT_C_STD_VERSION", config.CStdVersion) ctx.Strict("DEFAULT_CPP_STD_VERSION", config.CppStdVersion) |