moved nanopb flags from Makefile.template to build.yaml

7 years ago · dd8bc8cfb4
parent 7f9470297f
commit dd8bc8cfb4
4 changed files with 8 additions and 10 deletions
--- a/6
+++ b/6
@ -334,14 +334,10 @@ CXXFLAGS += -std=c++11
 ifeq ($(SYSTEM),Darwin)
 CXXFLAGS += -stdlib=libc++
 endif
-CPPFLAGS += -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -Wno-deprecated-declarations
+CPPFLAGS += -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -Wno-deprecated-declarations -Ithird_party/nanopb -DPB_FIELD_32BIT
 COREFLAGS += -fno-rtti -fno-exceptions
 LDFLAGS += -g

-# nanopb tweaks
-DEFINES += PB_FIELD_32BIT
-CPPFLAGS += -Ithird_party/nanopb
-
 CPPFLAGS += $(CPPFLAGS_$(CONFIG))
 CFLAGS += $(CFLAGS_$(CONFIG))
 CXXFLAGS += $(CXXFLAGS_$(CONFIG))
--- a/build.yaml
+++ b/build.yaml
@ -5611,7 +5611,7 @@ defaults:
  global:
    COREFLAGS: -fno-rtti -fno-exceptions
    CPPFLAGS: -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1
-      -Wno-deprecated-declarations
+      -Wno-deprecated-declarations -Ithird_party/nanopb -DPB_FIELD_32BIT
    LDFLAGS: -g
  zlib:
    CFLAGS: -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-implicit-function-declaration
--- a/grpc.gyp
+++ b/grpc.gyp
@ -59,6 +59,8 @@
      '-Wno-unused-parameter',
      '-DOSATOMIC_USE_INLINED=1',
      '-Wno-deprecated-declarations',
+      '-Ithird_party/nanopb',
+      '-DPB_FIELD_32BIT',
    ],
    'ldflags': [
      '-g',
@ -137,6 +139,8 @@
            '-Wno-unused-parameter',
            '-DOSATOMIC_USE_INLINED=1',
            '-Wno-deprecated-declarations',
+            '-Ithird_party/nanopb',
+            '-DPB_FIELD_32BIT',
          ],
          'OTHER_CPLUSPLUSFLAGS': [
            '-g',
@ -147,6 +151,8 @@
            '-Wno-unused-parameter',
            '-DOSATOMIC_USE_INLINED=1',
            '-Wno-deprecated-declarations',
+            '-Ithird_party/nanopb',
+            '-DPB_FIELD_32BIT',
            '-stdlib=libc++',
            '-std=c++11',
            '-Wno-error=deprecated-declarations',
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@ -221,10 +221,6 @@
  %  endif
  % endfor

-  # nanopb tweaks
-  DEFINES += PB_FIELD_32BIT
-  CPPFLAGS += -Ithird_party/nanopb
-
  CPPFLAGS += $(CPPFLAGS_$(CONFIG))
  CFLAGS += $(CFLAGS_$(CONFIG))
  CXXFLAGS += $(CXXFLAGS_$(CONFIG))