aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorMike Pall <mike>2023-09-09 12:50:13 +0200
committerMike Pall <mike>2023-09-09 12:50:13 +0200
commitcc8d88aafc5ff55e9d79d116ffe424a8c2b5c162 (patch)
tree77e8bd22dbe652b47b9204d4b1c4696fb20ec637 /src/Makefile
parent41fb94defa8f830ce69a8122b03f6ac3216d392a (diff)
parent4d05806ae046838826f9bab3b3b804eae26cd017 (diff)
downloadluajit-cc8d88aafc5ff55e9d79d116ffe424a8c2b5c162.tar.gz
luajit-cc8d88aafc5ff55e9d79d116ffe424a8c2b5c162.tar.bz2
luajit-cc8d88aafc5ff55e9d79d116ffe424a8c2b5c162.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index 8c47a16b..79340a96 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -475,7 +475,11 @@ DASM_FLAGS= $(DASM_XFLAGS) $(DASM_AFLAGS)
475DASM_DASC= vm_$(DASM_ARCH).dasc 475DASM_DASC= vm_$(DASM_ARCH).dasc
476 476
477GIT= git 477GIT= git
478GIT_RELVER= [ -e ../.git ] && $(GIT) show -s --format=%ct >luajit_relver.txt 2>/dev/null || cat ../.relver >luajit_relver.txt 2>/dev/null || : 478ifeq (Windows,$(HOST_SYS)$(HOST_MSYS))
479 GIT_RELVER= if exist ..\.git ( $(GIT) show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
480else
481 GIT_RELVER= [ -e ../.git ] && $(GIT) show -s --format=%ct >luajit_relver.txt 2>/dev/null || cat ../.relver >luajit_relver.txt 2>/dev/null || :
482endif
479GIT_DEP= $(wildcard ../.git/HEAD ../.git/refs/heads/*) 483GIT_DEP= $(wildcard ../.git/HEAD ../.git/refs/heads/*)
480 484
481BUILDVM_O= host/buildvm.o host/buildvm_asm.o host/buildvm_peobj.o \ 485BUILDVM_O= host/buildvm.o host/buildvm_asm.o host/buildvm_peobj.o \