diff options
| author | Elliott Hughes <enh@google.com> | 2016-10-07 13:12:58 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2016-10-13 14:41:31 +0000 |
| commit | 5a0401ab9c95eb8a7359724a630637d88db4994f (patch) | |
| tree | 83a0423e426cfc6b97f9ecf9fdf19f104f4fde74 /cc/makevars.go | |
| parent | fc754581fc1bbc42586a7ac6df3f9eddcbb6955f (diff) | |
| download | build_soong-5a0401ab9c95eb8a7359724a630637d88db4994f.tar.gz build_soong-5a0401ab9c95eb8a7359724a630637d88db4994f.tar.bz2 build_soong-5a0401ab9c95eb8a7359724a630637d88db4994f.zip | |
Consistently use -std=gnu99 for gcc as well as clang.
This matters for C files that are also built for Windows. Previously they'd
be compiled with -std=gnu99 for the host but [effectively] -std=gnu89 for
Windows.
Bug: http://b/32019064
Test: builds, and can build libcrypto_utils without a manual -std= line
Change-Id: I9c5cc7832220b5c3d6a007ff10d076e26fd8c75d
Diffstat (limited to 'cc/makevars.go')
| -rw-r--r-- | cc/makevars.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/makevars.go b/cc/makevars.go index ea321216..3dd0f745 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -113,7 +113,9 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, toolchain.ToolchainCflags(), productExtraCflags, }, " ")) - ctx.Strict(makePrefix+"GLOBAL_CONLYFLAGS", "") + ctx.Strict(makePrefix+"GLOBAL_CONLYFLAGS", strings.Join([]string{ + "${config.CommonGlobalConlyflags}", + }, " ")) ctx.Strict(makePrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{ "${config.CommonGlobalCppflags}", toolchain.Cppflags(), @@ -161,7 +163,6 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, clangExtras, productExtraCflags, }, " ")) - ctx.Strict(clangPrefix+"GLOBAL_CONLYFLAGS", "${config.ClangExtraConlyflags}") ctx.Strict(clangPrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{ "${config.CommonClangGlobalCppflags}", toolchain.ClangCppflags(), |