diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2020-05-29 10:16:24 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2020-05-29 10:16:24 -0700 |
| commit | 2fd7a43f2f5b2bafad6bfed68b6c0a00688ece9b (patch) | |
| tree | 8b2be430407cfed9b860875a30f4bab4da7c853c /ports/nrf | |
| parent | 198f9579f3b3120caf8d292b303ff2a070c74053 (diff) | |
| parent | 7ea95457eeb67fcaccfa911a4d979fa642262da5 (diff) | |
Merge remote-tracking branch 'adafruit/master' into wdt-nrf
Diffstat (limited to 'ports/nrf')
| -rwxr-xr-x | ports/nrf/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index e5931af5e..5b81fa9a7 100755 --- a/ports/nrf/Makefile +++ b/ports/nrf/Makefile @@ -93,7 +93,7 @@ else endif -CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) +CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) # Undo some warnings. # nrfx uses undefined preprocessor variables quite casually, so we can't do warning checks for these. @@ -114,7 +114,7 @@ CFLAGS += \ # TODO: check this CFLAGS += -D__START=main -LDFLAGS = $(CFLAGS) -nostartfiles -fshort-enums -Wl,-nostdlib -Wl,-T,$(GENERATED_LD_FILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections -specs=nano.specs +LDFLAGS = $(CFLAGS) -nostartfiles -Wl,-nostdlib -Wl,-T,$(GENERATED_LD_FILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections -specs=nano.specs LIBS := -lgcc -lc LDFLAGS += -mthumb -mcpu=cortex-m4 |