aboutsummaryrefslogtreecommitdiff
path: root/stand/liblua
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2018-02-23 04:04:03 +0000
committerWarner Losh <imp@FreeBSD.org>2018-02-23 04:04:03 +0000
commitff4cd9bfb12c6ac3a1a8483386673338def0fdf6 (patch)
tree0d5775cedb75abab1331982ad7bd280dc583f742 /stand/liblua
parent9ed6f9efdad4d5a24d769dc7a048f5aa8c6672df (diff)
downloadsrc-ff4cd9bfb12c6ac3a1a8483386673338def0fdf6.tar.gz
src-ff4cd9bfb12c6ac3a1a8483386673338def0fdf6.zip
Centralize lua defines
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
Notes
Notes: svn path=/head/; revision=329857
Diffstat (limited to 'stand/liblua')
-rw-r--r--stand/liblua/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/stand/liblua/Makefile b/stand/liblua/Makefile
index 6b4eaeb9be35..ed1b850d577f 100644
--- a/stand/liblua/Makefile
+++ b/stand/liblua/Makefile
@@ -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}