jeremy/callisto
1
Fork 0
Code Releases Activity

configure: separate callisto's cppflags from other libraries' cppflags

Browse source
This commit is contained in:
Jeremy Baxter 2024-02-27 18:05:21 +13:00
parent e86912a601
commit d21cceb014
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
configure vendored
View file

@ -7,7 +7,8 @@ set -e
mkf=config.mk mkf=config.mk
# these also apply to all libraries in external/ # these also apply to all libraries in external/
cflags='-std=c99' cflags='-std=c99'
cppflags='-DLUA_USE_POSIX' cppflags=''
ext_cppflags='-DLUA_USE_POSIX'
ldflags='-lm' ldflags='-lm'
# optional libraries to build with support for; a dynamically # optional libraries to build with support for; a dynamically
# linked Lua 5.4 library may be supported here later # linked Lua 5.4 library may be supported here later
@ -203,9 +204,12 @@ _CC = %s
_CFLAGS = %s _CFLAGS = %s
_CPPFLAGS = %s _CPPFLAGS = %s
_LDFLAGS =%s _LDFLAGS =%s
_EXT_CPPFLAGS = %s
' \ ' \
"$cc" \ "$cc" \
"$cflags" \ "$cflags" \
"$cppflags"\ "$cppflags"\
"$ldflags" \ "$ldflags" \
"$ext_cppflags"\
>"$mkf" >"$mkf"

2
external/lua/Makefile vendored
View file

@ -6,7 +6,7 @@
include ../../config.mk include ../../config.mk
CC= ${_CC} CC= ${_CC}
CFLAGS= ${_CFLAGS} ${_CPPFLAGS} CFLAGS= ${_CFLAGS} ${_EXT_CPPFLAGS}
LDFLAGS= ${_LDFLAGS} LDFLAGS= ${_LDFLAGS}
AR= ar cr AR= ar cr

2
external/lua/patches/lua-5.4.6-makefile.diff vendored
View file

@ -13,7 +13,7 @@
-LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) -LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
-LIBS= -lm $(SYSLIBS) $(MYLIBS) -LIBS= -lm $(SYSLIBS) $(MYLIBS)
+CC= ${_CC} +CC= ${_CC}
+CFLAGS= ${_CFLAGS} ${_CPPFLAGS} +CFLAGS= ${_CFLAGS} ${_EXT_CPPFLAGS}
+LDFLAGS= ${_LDFLAGS} +LDFLAGS= ${_LDFLAGS}
-AR= ar rcu -AR= ar rcu