gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2020-04-28 16:53:32 +02:00
commit f133649ced
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

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