aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2020-04-28 16:53:32 +0200
committerMike Pall <mike>2020-04-28 16:53:32 +0200
commitf133649ced961a6af920be89d646582ed7623424 (patch)
tree8460f772ef0e04e544026fa123a67873a3063d15 /src
parent9143e86498436892cb4316550be4d45b68a61224 (diff)
parentdb0b7ec194f9535c292a6084bd4bf57e9baf8b7e (diff)
downloadluajit-f133649ced961a6af920be89d646582ed7623424.tar.gz
luajit-f133649ced961a6af920be89d646582ed7623424.tar.bz2
luajit-f133649ced961a6af920be89d646582ed7623424.zip
Merge branch 'master' into v2.1
Diffstat (limited to '')
-rw-r--r--src/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index 77e0d537..07a94251 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -311,7 +311,6 @@ ifeq (Windows,$(TARGET_SYS))
311 TARGET_STRIP+= --strip-unneeded 311 TARGET_STRIP+= --strip-unneeded
312 TARGET_XSHLDFLAGS= -shared -Wl,--out-implib,$(TARGET_DLLDOTANAME) 312 TARGET_XSHLDFLAGS= -shared -Wl,--out-implib,$(TARGET_DLLDOTANAME)
313 TARGET_DYNXLDOPTS= 313 TARGET_DYNXLDOPTS=
314 HOST_RM= del
315else 314else
316 TARGET_AR+= 2>/dev/null 315 TARGET_AR+= 2>/dev/null
317ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1)) 316ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1))
@@ -563,6 +562,7 @@ ifeq (Windows,$(HOST_SYS))
563 MINILUA_X= host\minilua 562 MINILUA_X= host\minilua
564 BUILDVM_X= host\buildvm 563 BUILDVM_X= host\buildvm
565 ALL_RM:= $(subst /,\,$(ALL_RM)) 564 ALL_RM:= $(subst /,\,$(ALL_RM))
565 HOST_RM= del
566 endif 566 endif
567endif 567endif
568 568