Commit a90de79c authored by Philip Gladstone's avatar Philip Gladstone Committed by Marcel Stör
Browse files

Minor fix to allow building of luac.cross.int (#2697)

* Minor fix to allow building of luac.cross.int
* Reapply some changes lost due to merge damage
parent 5563b8a8
# #
# This Make file is called from the core Makefile hierarchy with is a hierarchical # This Makefile is called from the core Makefile hierarchy which is a hierarchical
# make wwhich uses parent callbacks to implement inheritance. However is luac_cross # make which uses parent callbacks to implement inheritance. However if luac_cross
# build stands outside this and uses the host toolchain to implement a separate # build stands outside this, it uses the host toolchain to implement a separate
# host build of the luac.cross image. # host build of the luac.cross image.
# #
.NOTPARALLEL: .NOTPARALLEL:
...@@ -54,7 +54,12 @@ CC := $(WRAPCC) gcc ...@@ -54,7 +54,12 @@ CC := $(WRAPCC) gcc
ECHO := echo ECHO := echo
IMAGE := ../../../luac.cross BUILD_TYPE := $(shell $(CC) $(EXTRA_CCFLAGS) -E -dM - <../../../app/include/user_config.h | grep LUA_NUMBER_INTEGRAL | wc -l)
ifeq ($(BUILD_TYPE),0)
IMAGE := ../../../luac.cross
else
IMAGE := ../../../luac.cross.int
endif
.PHONY: test clean all .PHONY: test clean all
...@@ -69,6 +74,7 @@ test : ...@@ -69,6 +74,7 @@ test :
@echo SRC: $(SRC) @echo SRC: $(SRC)
@echo OBJS: $(OBJS) @echo OBJS: $(OBJS)
@echo DEPS: $(DEPS) @echo DEPS: $(DEPS)
@echo IMAGE: $(IMAGE)
clean : clean :
$(RM) -r $(ODIR) $(RM) -r $(ODIR)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment