diff options
| author | Jim Mussared | 2019-10-16 15:12:39 +1100 |
|---|---|---|
| committer | Damien George | 2019-10-21 23:01:41 +1100 |
| commit | 8ba963cfa3da8e712e94c2429cfd6f064b1b4c69 (patch) | |
| tree | 80ba4c57de3e596b2752d630621b6e5c1727ba06 /py/mkenv.mk | |
| parent | 12413e92a3f938bdfe844bd65bf189ee1431e1d0 (diff) | |
tools/makemanifest.py: Eval relative paths w.r.t. current manifest file.
When loading a manifest file, e.g. by include(), it will chdir first to the
directory of that manifest. This means that all file operations within a
manifest are relative to that manifest's location.
As a consequence of this, additional environment variables are needed to
find absolute paths, so the following are added: $(MPY_LIB_DIR),
$(PORT_DIR), $(BOARD_DIR). And rename $(MPY) to $(MPY_DIR) to be
consistent.
Existing manifests are updated to match.
Diffstat (limited to 'py/mkenv.mk')
| -rw-r--r-- | py/mkenv.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/py/mkenv.mk b/py/mkenv.mk index 70d937c45..3efeb1816 100644 --- a/py/mkenv.mk +++ b/py/mkenv.mk @@ -66,6 +66,8 @@ MAKE_FROZEN = $(PYTHON) $(TOP)/tools/make-frozen.py MPY_CROSS = $(TOP)/mpy-cross/mpy-cross MPY_TOOL = $(PYTHON) $(TOP)/tools/mpy-tool.py +MPY_LIB_DIR = $(TOP)/../micropython-lib + all: .PHONY: all |