follow-up: CC override was in MAKELUAFLAGS
Just make sure it is uing the correct one remove the addition in the previous commit
This commit is contained in:
@@ -125,7 +125,7 @@ RECOVERBIN = recover
|
|||||||
LUAHEADERS ?= lib/lua-$(LUA_VERSION)/src
|
LUAHEADERS ?= lib/lua-$(LUA_VERSION)/src
|
||||||
LUATESTTARGET ?= $(LUAHEADERS)/lua.h
|
LUATESTTARGET ?= $(LUAHEADERS)/lua.h
|
||||||
LUATOP = $(LUAHEADERS)
|
LUATOP = $(LUAHEADERS)
|
||||||
LUAMAKEFLAGS = CC='$(CC)' SYSCFLAGS='$(SYSCFLAGS)'
|
LUAMAKEFLAGS = CC='$(TARGET_CC)' SYSCFLAGS='$(SYSCFLAGS)'
|
||||||
LUA2NHTOP ?= ../../..
|
LUA2NHTOP ?= ../../..
|
||||||
LUABASELIB ?= liblua-$(LUA_VERSION).a
|
LUABASELIB ?= liblua-$(LUA_VERSION).a
|
||||||
LUATOPLIB ?= lib/lua/$(LUABASELIB)
|
LUATOPLIB ?= lib/lua/$(LUABASELIB)
|
||||||
@@ -145,7 +145,7 @@ $(GAME): lua_support
|
|||||||
lua_support: include/nhlua.h
|
lua_support: include/nhlua.h
|
||||||
@true
|
@true
|
||||||
$(LUATOP)/liblua.a: $(LUAHEADERS)/lua.h
|
$(LUATOP)/liblua.a: $(LUAHEADERS)/lua.h
|
||||||
( cd $(LUATOP) && make $(LUAMAKEFLAGS) CC=$(TARGET_CC) a )
|
( cd $(LUATOP) && make $(LUAMAKEFLAGS) a )
|
||||||
lib/lua/$(LUABASELIB): $(LUALIBBUILT)
|
lib/lua/$(LUABASELIB): $(LUALIBBUILT)
|
||||||
@( if test -d lib/lua ; then true ; else mkdir -p lib/lua ; fi )
|
@( if test -d lib/lua ; then true ; else mkdir -p lib/lua ; fi )
|
||||||
cp $(LUATOP)/liblua.a $@
|
cp $(LUATOP)/liblua.a $@
|
||||||
@@ -165,7 +165,7 @@ lib/lua-$(LUA_VERSION)/src/lua.h:
|
|||||||
@false
|
@false
|
||||||
luabin:
|
luabin:
|
||||||
( cd $(LUATOP) \
|
( cd $(LUATOP) \
|
||||||
&& make $(LUAMAKEFILES) CC=$(TARGET_CC) all && cd $(LUA2NHTOP) )
|
&& make $(LUAMAKEFILES) all && cd $(LUA2NHTOP) )
|
||||||
|
|
||||||
# This is only needed for some internal tools.
|
# This is only needed for some internal tools.
|
||||||
nhlua:
|
nhlua:
|
||||||
|
|||||||
Reference in New Issue
Block a user