diff options
| author | Mike Pall <mike> | 2023-08-22 17:06:14 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2023-08-22 17:06:14 +0200 |
| commit | ff192d134dbe865e210b9b89bb5cf5f0c3022a27 (patch) | |
| tree | 39f18ca1b75ab432aced2d6e1729b717e5abadaf /src | |
| parent | 0b5bf71e37b973aad8022f2b3d25e03434e23987 (diff) | |
| parent | d0ce82ecdcf0fcfb766e207eac6b7622680817b2 (diff) | |
| download | luajit-ff192d134dbe865e210b9b89bb5cf5f0c3022a27.tar.gz luajit-ff192d134dbe865e210b9b89bb5cf5f0c3022a27.tar.bz2 luajit-ff192d134dbe865e210b9b89bb5cf5f0c3022a27.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 3a6a4329..8c47a16b 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -475,7 +475,7 @@ DASM_FLAGS= $(DASM_XFLAGS) $(DASM_AFLAGS) | |||
| 475 | DASM_DASC= vm_$(DASM_ARCH).dasc | 475 | DASM_DASC= vm_$(DASM_ARCH).dasc |
| 476 | 476 | ||
| 477 | GIT= git | 477 | GIT= git |
| 478 | GIT_RELVER= [ -d ../.git ] && $(GIT) show -s --format=%ct >luajit_relver.txt 2>/dev/null || cat ../.relver >luajit_relver.txt 2>/dev/null || : | 478 | GIT_RELVER= [ -e ../.git ] && $(GIT) show -s --format=%ct >luajit_relver.txt 2>/dev/null || cat ../.relver >luajit_relver.txt 2>/dev/null || : |
| 479 | GIT_DEP= $(wildcard ../.git/HEAD ../.git/refs/heads/*) | 479 | GIT_DEP= $(wildcard ../.git/HEAD ../.git/refs/heads/*) |
| 480 | 480 | ||
| 481 | BUILDVM_O= host/buildvm.o host/buildvm_asm.o host/buildvm_peobj.o \ | 481 | BUILDVM_O= host/buildvm.o host/buildvm_asm.o host/buildvm_peobj.o \ |