commit 09d37bae6e0f4adfe223cadf60d986a6e73d5801
author Michael Spang <spang@google.com> Tue Jun 16 21:52:19 2020 -0400
committer CQ Bot Account <commit-bot@chromium.org> Wed Jun 17 19:12:47 2020 +0000
tree ece94998e4f8cb896b4f2f37049fc960eca509bd
parent 71ecc1d60d27b0094c6548624866f6dbb3fa347d

pw_toolchain: Fix cflags ordering in pigweed

Putting cflags_cc before cflags prevents disabling C++ specific
warnings. Swap them.

Change-Id: I73e2f2821e37fd7cace75ecb8de65509680e235d

pw_toolchain/generate_toolchain.gni

diff --git a/pw_toolchain/generate_toolchain.gni b/pw_toolchain/generate_toolchain.gni
index a171d3a..db25b1e 100644
--- a/pw_toolchain/generate_toolchain.gni
+++ b/pw_toolchain/generate_toolchain.gni
@@ -73,8 +73,8 @@
                               [
                                 invoker.cc,
                                 "-MMD -MF $depfile",  # Write out dependencies.
-                                "{{cflags_c}}",
                                 "{{cflags}}",
+                                "{{cflags_c}}",  # Must come after {{cflags}}.
                                 "{{defines}}",
                                 "{{include_dirs}}",
                                 "-c {{source}}",
@@ -94,8 +94,8 @@
                               [
                                 invoker.cxx,
                                 "-MMD -MF $depfile",  # Write out dependencies.
-                                "{{cflags_cc}}",
                                 "{{cflags}}",
+                                "{{cflags_cc}}",  # Must come after {{cflags}}.
                                 "{{defines}}",
                                 "{{include_dirs}}",
                                 "-c {{source}}",