d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Centralize lua defines

Browse Source 
We need to ensure that we defined Numbers as int64_t everywhere we
build for lua. Previously, we were compiling part of the code with
Numbers as int64_t and part as double. Move lua number definition to a
more-central location
This commit is contained in:
imp 2018-02-23 04:04:03 +00:00
parent ef8f5a3bc4
commit 0326683caf
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stand/liblua/Makefile
View File

@ -5,6 +5,8 @@
.PATH: ${LUASRC}
.PATH: ${LIBLUASRC}
.include "${BOOTSRC}/lua.mk"
LIB= lua
INTERNALLIB=
@ -25,9 +27,8 @@ SRCS+= lerrno.c lfs.c lstd.c lutils.c
WARNS= 3
CFLAGS+= -DLUA_FLOAT_TYPE=LUA_FLOAT_INT64
CFLAGS+= -DLUA_PATH_DEFAULT=\"/boot/lua/\?.lua\"
CFLAGS+= -ffreestanding -nostdlib -DBOOT_LUA -DLUA_USE_POSIX
CFLAGS+= -ffreestanding -nostdlib -DLUA_USE_POSIX
CFLAGS+= -fno-stack-protector -D__BSD_VISIBLE
CFLAGS+= -I${BOOTSRC}/include -I${LIBLUASRC} -I${LUASRC} -I${LDRSRC}

9
stand/lua.mk
View File

@ -2,11 +2,6 @@
# Common flags to build lua related files
.include "defs.mk"
.if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 0
CFLAGS+= -fPIC
.endif
CFLAGS+= -I${LUASRC} -I${LDRSRC} -I${LIBLUASRC}
CFLAGS+= -DBOOT_LUA
# CFLAGS+= -Ddouble=jagged-little-pill -Dfloat=poison-shake -D__OMIT_FLOAT
CFLAGS+= -DLUA_FLOAT_TYPE=LUA_FLOAT_INT64