diff options
| author | Dan Halbert <halbert@halwitz.org> | 2017-10-26 22:31:56 -0400 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2017-10-27 17:32:13 -0400 |
| commit | f0a12d96203784e4bd636f201d6d050f48c537e7 (patch) | |
| tree | 055a1990921d4aa7bca3dfc3dd7a529021926ce2 | |
| parent | 4232a0a196feb08588dda3199012a166ad65aec4 (diff) | |
Check INTERNAL_LIBM make flag in a safer way.
| -rw-r--r-- | ports/atmel-samd/Makefile | 8 | ||||
| -rw-r--r-- | ports/atmel-samd/mpconfigport.mk | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile index f9751415a..ef168dbc9 100644 --- a/ports/atmel-samd/Makefile +++ b/ports/atmel-samd/Makefile @@ -238,10 +238,10 @@ SRC_C = \ # Choose which flash filesystem impl to use. # (Right now INTERNAL_FLASH_FILESYSTEM and SPI_FLASH_FILESYSTEM are mutually exclusive. # But that might not be true in the future.) -ifdef INTERNAL_FLASH_FILESYSTEM +ifeq ($(INTERNAL_FLASH_FILESYSTEM),1) SRC_C += internal_flash.c endif -ifdef SPI_FLASH_FILESYSTEM +ifeq ($(SPI_FLASH_FILESYSTEM),1) SRC_C += spi_flash.c endif @@ -278,7 +278,7 @@ SRC_COMMON_HAL = \ usb_hid/__init__.c \ usb_hid/Device.c -ifdef INTERNAL_LIBM +ifeq ($(INTERNAL_LIBM),1) SRC_LIBM = $(addprefix lib/,\ libm/math.c \ libm/fmodf.c \ @@ -338,7 +338,7 @@ OBJ = $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(SRC_ASF:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_EXPANDED:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(SRC_SHARED_MODULE_EXPANDED:.c=.o)) -ifdef INTERNAL_LIBM +ifeq ($(INTERNAL_LIBM),1) OBJ += $(addprefix $(BUILD)/, $(SRC_LIBM:.c=.o)) endif diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index acb0916fc..c3b2f22d4 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -3,5 +3,5 @@ # This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h. MPY_TOOL_LONGINT_IMPL = -mlongint-impl=none -INTERNAL_LIBM = (1) +INTERNAL_LIBM = 1 |