diff options
| author | Damien George <damien.p.george@gmail.com> | 2018-07-10 14:11:28 +1000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2018-07-10 14:11:28 +1000 |
| commit | ee40d1704fc3ec285f0be67ef7010670a1c5c01a (patch) | |
| tree | 35a25668aaa68547b4b18b3120912739154511b9 | |
| parent | c700ff52a0e8d5b2a100d1333ea0e0936629fb58 (diff) | |
mpy-cross: Make build independent of extmod directory.
mpy-cross doesn't depend on any code in the extmod directory so completely
exclude it from the build (extmod may still be scanned for qstrs but that
is controlled by py/py.mk). This speeds up the build a little, and
improves abstraction of this component.
Also, make -I$(BUILD) take precedence over -I$(TOP) in case there are stray
files in the root directory that would be picked up.
| -rw-r--r-- | mpy-cross/Makefile | 6 | ||||
| -rw-r--r-- | mpy-cross/mphalport.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mpy-cross/Makefile b/mpy-cross/Makefile index 53ce50c7f..0f39a6393 100644 --- a/mpy-cross/Makefile +++ b/mpy-cross/Makefile @@ -25,9 +25,9 @@ UNAME_S := $(shell uname -s) # include py core make definitions include $(TOP)/py/py.mk -INC += -I. -INC += -I$(TOP) +INC += -I. INC += -I$(BUILD) +INC += -I$(TOP) # compiler settings CWARN = -Wall -Werror @@ -68,7 +68,7 @@ ifneq (,$(findstring mingw,$(COMPILER_TARGET))) SRC_C += ports/windows/fmode.c endif -OBJ = $(PY_O) +OBJ = $(PY_CORE_O) OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) include $(TOP)/py/mkrules.mk diff --git a/mpy-cross/mphalport.h b/mpy-cross/mphalport.h index 4bd8276f3..383592831 100644 --- a/mpy-cross/mphalport.h +++ b/mpy-cross/mphalport.h @@ -1 +1,2 @@ -// empty file +// prevent including extmod/virtpin.h +#define mp_hal_pin_obj_t |