Date: Fri, 23 Feb 2018 04:04:03 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329857 - in head/stand: . liblua Message-ID: <201802230404.w1N443dd053717@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Fri Feb 23 04:04:03 2018 New Revision: 329857 URL: https://svnweb.freebsd.org/changeset/base/329857 Log: 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 Modified: head/stand/liblua/Makefile head/stand/lua.mk Modified: head/stand/liblua/Makefile ============================================================================== --- head/stand/liblua/Makefile Fri Feb 23 04:03:07 2018 (r329856) +++ head/stand/liblua/Makefile Fri Feb 23 04:04:03 2018 (r329857) @@ -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} Modified: head/stand/lua.mk ============================================================================== --- head/stand/lua.mk Fri Feb 23 04:03:07 2018 (r329856) +++ head/stand/lua.mk Fri Feb 23 04:04:03 2018 (r329857) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802230404.w1N443dd053717>