diff options
| author | Dave Hylands <dhylands@gmail.com> | 2014-01-25 08:55:31 -0800 |
|---|---|---|
| committer | Dave Hylands <dhylands@gmail.com> | 2014-01-25 08:55:31 -0800 |
| commit | 1a3b0d5fed935d85787e6902c5fa6f3bf48011dd (patch) | |
| tree | 08d5e4c37a9ed14095680fb6472bf3ef0bd4218e | |
| parent | 449dd0a69ecee497c5a7da1da23d8ff53778b363 (diff) | |
| download | micropython-1a3b0d5fed935d85787e6902c5fa6f3bf48011dd.tar.gz micropython-1a3b0d5fed935d85787e6902c5fa6f3bf48011dd.zip | |
Fixed dependency problem for qstrdefs.generated.h
The problem manifests itself in make 4.0
I also fixed the LINK message when linking the final executable for unix and unix-cpy.
| -rw-r--r-- | py/mkrules.mk | 2 | ||||
| -rw-r--r-- | py/py.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/py/mkrules.mk b/py/mkrules.mk index 4c1ea08332..1ab3ee59ba 100644 --- a/py/mkrules.mk +++ b/py/mkrules.mk @@ -65,7 +65,7 @@ ifneq ($(PROG),) all: $(PROG) $(PROG): $(OBJ) - $(ECHO) "LINK $<" + $(ECHO) "LINK $@" $(Q)$(CC) -o $@ $(OBJ) $(LIB) $(LDFLAGS) ifndef DEBUG $(Q)strip $(PROG) @@ -78,7 +78,7 @@ PY_O = $(addprefix $(PY_BUILD)/, $(PY_O_BASENAME)) # Adding an order only dependency on $(PY_BUILD) causes $(PY_BUILD) to get # created before we run the script to generate the .h -$(PY_BUILD)/qstrdefs.generated.h: | $(PY_BUILD) +$(PY_BUILD)/qstrdefs.generated.h: | $(PY_BUILD)/ $(PY_BUILD)/qstrdefs.generated.h: $(PY_QSTR_DEFS) $(QSTR_DEFS) $(PY_SRC)/makeqstrdata.py $(ECHO) "makeqstrdata $(PY_QSTR_DEFS) $(QSTR_DEFS)" $(Q)python $(PY_SRC)/makeqstrdata.py $(PY_QSTR_DEFS) $(QSTR_DEFS) > $@ |