Commit 1a3b0d5f authored by Dave Hylands's avatar Dave Hylands
Browse files

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.
parent 449dd0a6
...@@ -65,7 +65,7 @@ ifneq ($(PROG),) ...@@ -65,7 +65,7 @@ ifneq ($(PROG),)
all: $(PROG) all: $(PROG)
$(PROG): $(OBJ) $(PROG): $(OBJ)
$(ECHO) "LINK $<" $(ECHO) "LINK $@"
$(Q)$(CC) -o $@ $(OBJ) $(LIB) $(LDFLAGS) $(Q)$(CC) -o $@ $(OBJ) $(LIB) $(LDFLAGS)
ifndef DEBUG ifndef DEBUG
$(Q)strip $(PROG) $(Q)strip $(PROG)
......
...@@ -78,7 +78,7 @@ PY_O = $(addprefix $(PY_BUILD)/, $(PY_O_BASENAME)) ...@@ -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 # Adding an order only dependency on $(PY_BUILD) causes $(PY_BUILD) to get
# created before we run the script to generate the .h # 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 $(PY_BUILD)/qstrdefs.generated.h: $(PY_QSTR_DEFS) $(QSTR_DEFS) $(PY_SRC)/makeqstrdata.py
$(ECHO) "makeqstrdata $(PY_QSTR_DEFS) $(QSTR_DEFS)" $(ECHO) "makeqstrdata $(PY_QSTR_DEFS) $(QSTR_DEFS)"
$(Q)python $(PY_SRC)/makeqstrdata.py $(PY_QSTR_DEFS) $(QSTR_DEFS) > $@ $(Q)python $(PY_SRC)/makeqstrdata.py $(PY_QSTR_DEFS) $(QSTR_DEFS) > $@
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment