configure: separate callisto's cppflags from other libraries' cppflags
This commit is contained in:
parent
e86912a601
commit
d21cceb014
3 changed files with 7 additions and 3 deletions
6
configure
vendored
6
configure
vendored
|
@ -7,7 +7,8 @@ set -e
|
|||
mkf=config.mk
|
||||
# these also apply to all libraries in external/
|
||||
cflags='-std=c99'
|
||||
cppflags='-DLUA_USE_POSIX'
|
||||
cppflags=''
|
||||
ext_cppflags='-DLUA_USE_POSIX'
|
||||
ldflags='-lm'
|
||||
# optional libraries to build with support for; a dynamically
|
||||
# linked Lua 5.4 library may be supported here later
|
||||
|
@ -203,9 +204,12 @@ _CC = %s
|
|||
_CFLAGS = %s
|
||||
_CPPFLAGS = %s
|
||||
_LDFLAGS =%s
|
||||
|
||||
_EXT_CPPFLAGS = %s
|
||||
' \
|
||||
"$cc" \
|
||||
"$cflags" \
|
||||
"$cppflags"\
|
||||
"$ldflags" \
|
||||
"$ext_cppflags"\
|
||||
>"$mkf"
|
||||
|
|
2
external/lua/Makefile
vendored
2
external/lua/Makefile
vendored
|
@ -6,7 +6,7 @@
|
|||
include ../../config.mk
|
||||
|
||||
CC= ${_CC}
|
||||
CFLAGS= ${_CFLAGS} ${_CPPFLAGS}
|
||||
CFLAGS= ${_CFLAGS} ${_EXT_CPPFLAGS}
|
||||
LDFLAGS= ${_LDFLAGS}
|
||||
|
||||
AR= ar cr
|
||||
|
|
2
external/lua/patches/lua-5.4.6-makefile.diff
vendored
2
external/lua/patches/lua-5.4.6-makefile.diff
vendored
|
@ -13,7 +13,7 @@
|
|||
-LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
|
||||
-LIBS= -lm $(SYSLIBS) $(MYLIBS)
|
||||
+CC= ${_CC}
|
||||
+CFLAGS= ${_CFLAGS} ${_CPPFLAGS}
|
||||
+CFLAGS= ${_CFLAGS} ${_EXT_CPPFLAGS}
|
||||
+LDFLAGS= ${_LDFLAGS}
|
||||
|
||||
-AR= ar rcu
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue