diff options
| author | Mike Pall <mike> | 2020-08-05 14:17:41 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2020-08-05 14:17:41 +0200 |
| commit | 98682accbb6141ecfd98cfd50298105abb288822 (patch) | |
| tree | 85ba68ddbd9ce1bbafa0788d7513295ff71e1c96 /src | |
| parent | 570e758ca7dd14f93efdd43d68cf8979c1d7f984 (diff) | |
| parent | c4b1e0feae75248f37945b1993f469df0d9ead53 (diff) | |
| download | luajit-98682accbb6141ecfd98cfd50298105abb288822.tar.gz luajit-98682accbb6141ecfd98cfd50298105abb288822.tar.bz2 luajit-98682accbb6141ecfd98cfd50298105abb288822.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 702207cc..e65b55ee 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -634,7 +634,7 @@ $(MINILUA_T): $(MINILUA_O) | |||
| 634 | $(E) "HOSTLINK $@" | 634 | $(E) "HOSTLINK $@" |
| 635 | $(Q)$(HOST_CC) $(HOST_ALDFLAGS) -o $@ $(MINILUA_O) $(MINILUA_LIBS) $(HOST_ALIBS) | 635 | $(Q)$(HOST_CC) $(HOST_ALDFLAGS) -o $@ $(MINILUA_O) $(MINILUA_LIBS) $(HOST_ALIBS) |
| 636 | 636 | ||
| 637 | host/buildvm_arch.h: $(DASM_DASC) $(DASM_DEP) $(DASM_DIR)/*.lua | 637 | host/buildvm_arch.h: $(DASM_DASC) $(DASM_DEP) $(DASM_DIR)/*.lua lj_arch.h lua.h luaconf.h |
| 638 | $(E) "DYNASM $@" | 638 | $(E) "DYNASM $@" |
| 639 | $(Q)$(DASM) $(DASM_FLAGS) -o $@ $(DASM_DASC) | 639 | $(Q)$(DASM) $(DASM_FLAGS) -o $@ $(DASM_DASC) |
| 640 | 640 | ||