From d1910a9e5edc33a5945aaba07f5d041f7718421d Mon Sep 17 00:00:00 2001 From: Francisco Ferreira Date: Tue, 29 Mar 2016 00:06:05 +0100 Subject: [PATCH] mk: don't error on unknown pragmas --- mk/board_flymaple.mk | 2 +- mk/board_native.mk | 2 +- mk/board_qurt.mk | 2 +- mk/px4_targets.mk | 2 +- mk/vrbrain_targets.mk | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mk/board_flymaple.mk b/mk/board_flymaple.mk index f6fd534a3f..d7a77b2c64 100644 --- a/mk/board_flymaple.mk +++ b/mk/board_flymaple.mk @@ -35,7 +35,7 @@ DEFINES += -DSKETCH=\"$(SKETCH)\" -DAPM_BUILD_DIRECTORY=APM_BUILD_$(SKE DEFINES += $(EXTRAFLAGS) DEFINES += -DCONFIG_HAL_BOARD=$(HAL_BOARD) WARNFLAGS = -Wall -Wextra -Wlogical-op -Wformat -Wshadow -Wpointer-arith -Wcast-align -Wno-psabi -WARNFLAGS += -Wwrite-strings -Wformat=2 -Wno-unused-parameter -Wno-redundant-decls +WARNFLAGS += -Wwrite-strings -Wformat=2 -Wno-unused-parameter -Wno-redundant-decls -Wno-unknown-pragmas WARNFLAGSCXX = -Wno-reorder DEPFLAGS = -MD -MT $@ diff --git a/mk/board_native.mk b/mk/board_native.mk index 2ebc10a0a0..6b44332339 100644 --- a/mk/board_native.mk +++ b/mk/board_native.mk @@ -10,7 +10,7 @@ DEFINES += -DSKETCH=\"$(SKETCH)\" -DSKETCHNAME="\"$(SKETCH)\"" -DSKETCH DEFINES += $(EXTRAFLAGS) DEFINES += -DCONFIG_HAL_BOARD=$(HAL_BOARD) -DCONFIG_HAL_BOARD_SUBTYPE=$(HAL_BOARD_SUBTYPE) WARNFLAGS = -Wall -Wextra -Wformat -Wshadow -Wpointer-arith -Wcast-align \ - -Wlogical-op -Wwrite-strings -Wformat=2 -Wno-unused-parameter + -Wlogical-op -Wwrite-strings -Wformat=2 -Wno-unused-parameter -Wno-unknown-pragmas WARNFLAGSCXX = \ -Wno-missing-field-initializers \ -Wno-reorder \ diff --git a/mk/board_qurt.mk b/mk/board_qurt.mk index 61a2dabf6b..e96a7b13b3 100644 --- a/mk/board_qurt.mk +++ b/mk/board_qurt.mk @@ -56,7 +56,7 @@ CXXFLAGS += -std=gnu++11 $(WARNFLAGS) $(WARNFLAGSCXX) $(DEPFLAGS) $(MISS CFLAGS += $(WARNFLAGS) $(DEPFLAGS) $(COPTS) $(DEFINES) $(DSP_FLAGS) ARM_INC=-I$(HEXAGON_SDK_ROOT)/lib/common/remote/ship/UbuntuARM_Debug -I$(SKETCHBOOK)/libraries/ -ARM_WARN=-Wno-unused-parameter +ARM_WARN=-Wno-unused-parameter -Wno-unknown-pragmas ARM_CFLAGS=$(ARM_WARN) -fPIC -mword-relocations -mthumb-interwork -mfloat-abi=hard -mfpu=neon -mtune=cortex-a8 -march=armv7-a -g -O0 -fno-strict-aliasing -DARM_ARCH_7A -DUSE_SYSLOG $(ARM_INC) -I$(HEXAGON_SDK_ROOT)/inc/stddef -DCONFIG_HAL_BOARD=HAL_BOARD_LINUX -DCONFIG_HAL_BOARD_SUBTYPE=HAL_BOARD_SUBTYPE_LINUX_QFLIGHT ifeq ($(VERBOSE),) diff --git a/mk/px4_targets.mk b/mk/px4_targets.mk index e85e08d792..b1d21d8bdd 100644 --- a/mk/px4_targets.mk +++ b/mk/px4_targets.mk @@ -51,7 +51,7 @@ PX4_V4_CONFIG_FILE=$(MK_DIR)/PX4/config_px4fmu-v4_APM.mk SKETCHFLAGS=$(SKETCHLIBINCLUDES) -DARDUPILOT_BUILD -DTESTS_MATHLIB_DISABLE -DCONFIG_HAL_BOARD=HAL_BOARD_PX4 -DSKETCHNAME="\\\"$(SKETCH)\\\"" -DSKETCH_MAIN=ArduPilot_main -DAPM_BUILD_DIRECTORY=APM_BUILD_$(SKETCH) -WARNFLAGS = -Wall -Wextra -Wlogical-op -Werror -Wno-redundant-decls -Wno-psabi -Wno-packed -Wno-error=double-promotion -Wno-error=unused-variable -Wno-error=reorder -Wno-error=float-equal -Wno-error=pmf-conversions -Wno-error=missing-declarations -Wno-error=unused-function +WARNFLAGS = -Wall -Wextra -Wlogical-op -Werror -Wno-unknown-pragmas -Wno-redundant-decls -Wno-psabi -Wno-packed -Wno-error=double-promotion -Wno-error=unused-variable -Wno-error=reorder -Wno-error=float-equal -Wno-error=pmf-conversions -Wno-error=missing-declarations -Wno-error=unused-function OPTFLAGS = -fsingle-precision-constant # avoid PX4 submodules diff --git a/mk/vrbrain_targets.mk b/mk/vrbrain_targets.mk index a9dd648d26..297a360691 100644 --- a/mk/vrbrain_targets.mk +++ b/mk/vrbrain_targets.mk @@ -56,7 +56,7 @@ VRBRAIN_VH10_CONFIG_FILE=config_vrhero-v10_APM.mk SKETCHFLAGS=$(SKETCHLIBINCLUDES) -I$(PWD) -DARDUPILOT_BUILD -DTESTS_MATHLIB_DISABLE -DCONFIG_HAL_BOARD=HAL_BOARD_VRBRAIN -DSKETCHNAME="\\\"$(SKETCH)\\\"" -DSKETCH_MAIN=ArduPilot_main -DAPM_BUILD_DIRECTORY=APM_BUILD_$(SKETCH) -WARNFLAGS = -Wall -Wextra -Wlogical-op -Wno-redundant-decls -Wno-psabi -Wno-packed +WARNFLAGS = -Wall -Wextra -Wlogical-op -Wno-redundant-decls -Wno-psabi -Wno-packed -Wno-unknown-pragmas VRBRAIN_MAKE = $(v) make -C $(SKETCHBOOK) -f $(VRBRAIN_ROOT)/Makefile EXTRADEFINES="$(SKETCHFLAGS) $(WARNFLAGS) "'$(EXTRAFLAGS)' APM_MODULE_DIR=$(SKETCHBOOK) SKETCHBOOK=$(SKETCHBOOK) CCACHE=$(CCACHE) VRBRAIN_ROOT=$(VRBRAIN_ROOT) VRBRAIN_NUTTX_SRC=$(VRBRAIN_NUTTX_SRC) MAXOPTIMIZATION="-Os" VRBRAIN_MAKE_ARCHIVES = make -C $(VRBRAIN_ROOT) VRBRAIN_NUTTX_SRC=$(VRBRAIN_NUTTX_SRC) CCACHE=$(CCACHE) archives MAXOPTIMIZATION="-Os"