Merge branch 'master' into v2.1

master
Mike Pall 2020-04-28 16:53:32 +02:00
commit f133649ced
1 changed files with 1 additions and 1 deletions

View File

@ -311,7 +311,6 @@ ifeq (Windows,$(TARGET_SYS))
TARGET_STRIP+= --strip-unneeded
TARGET_XSHLDFLAGS= -shared -Wl,--out-implib,$(TARGET_DLLDOTANAME)
TARGET_DYNXLDOPTS=
HOST_RM= del
else
TARGET_AR+= 2>/dev/null
ifeq (,$(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))
MINILUA_X= host\minilua
BUILDVM_X= host\buildvm
ALL_RM:= $(subst /,\,$(ALL_RM))
HOST_RM= del
endif
endif