diff options
| author | hathach <[email protected]> | 2019-10-01 15:43:28 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2019-10-01 15:43:28 +0700 |
| commit | 6479ee53d5ecaf2b47b59979239ac31868779c05 (patch) | |
| tree | 156cd459525df4b049a41c6afffc73b1dc75b4a9 | |
| parent | 12609f818b59756f70c0059275a0de391c85ee3a (diff) | |
-Wno-error=cast-function-type is only available for gcc 8+, change travis dist to bionic
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | hw/bsp/circuitplayground_bluefruit/board.mk | 3 | ||||
| -rw-r--r-- | hw/bsp/feather_nrf52840_express/board.mk | 3 | ||||
| -rw-r--r-- | hw/bsp/pca10056/board.mk | 3 | ||||
| -rw-r--r-- | hw/bsp/pca10059/board.mk | 3 |
5 files changed, 13 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index f2f2ba51d..6dfc507fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: c -dist: xenial +dist: bionic compiler: - gcc diff --git a/hw/bsp/circuitplayground_bluefruit/board.mk b/hw/bsp/circuitplayground_bluefruit/board.mk index c1513fe7c..72b9ddfbe 100644 --- a/hw/bsp/circuitplayground_bluefruit/board.mk +++ b/hw/bsp/circuitplayground_bluefruit/board.mk @@ -12,7 +12,10 @@ CFLAGS += \ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter # due to tusb_hal_nrf_power_event +GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion))) +ifeq ($(shell expr $(GCCVERSION) \>= 8), 1) CFLAGS += -Wno-error=cast-function-type +endif # All source paths should be relative to the top level. LD_FILE = hw/bsp/circuitplayground_bluefruit/nrf52840_s140_v6.ld diff --git a/hw/bsp/feather_nrf52840_express/board.mk b/hw/bsp/feather_nrf52840_express/board.mk index 1900bedbb..1e077bac7 100644 --- a/hw/bsp/feather_nrf52840_express/board.mk +++ b/hw/bsp/feather_nrf52840_express/board.mk @@ -12,7 +12,10 @@ CFLAGS += \ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter # due to tusb_hal_nrf_power_event +GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion))) +ifeq ($(shell expr $(GCCVERSION) \>= 8), 1) CFLAGS += -Wno-error=cast-function-type +endif # All source paths should be relative to the top level. LD_FILE = hw/bsp/feather_nrf52840_express/nrf52840_s140_v6.ld diff --git a/hw/bsp/pca10056/board.mk b/hw/bsp/pca10056/board.mk index dc2c434f4..c0616abee 100644 --- a/hw/bsp/pca10056/board.mk +++ b/hw/bsp/pca10056/board.mk @@ -12,7 +12,10 @@ CFLAGS += \ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter # due to tusb_hal_nrf_power_event +GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion))) +ifeq ($(shell expr $(GCCVERSION) \>= 8), 1) CFLAGS += -Wno-error=cast-function-type +endif # All source paths should be relative to the top level. LD_FILE = hw/mcu/nordic/nrfx/mdk/nrf52840_xxaa.ld diff --git a/hw/bsp/pca10059/board.mk b/hw/bsp/pca10059/board.mk index 0ef56ed50..15801054c 100644 --- a/hw/bsp/pca10059/board.mk +++ b/hw/bsp/pca10059/board.mk @@ -12,7 +12,10 @@ CFLAGS += \ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter # due to tusb_hal_nrf_power_event +GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion))) +ifeq ($(shell expr $(GCCVERSION) \>= 8), 1) CFLAGS += -Wno-error=cast-function-type +endif # All source paths should be relative to the top level. LD_FILE = hw/bsp/$(BOARD)/$(BOARD).ld |