MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

create luac.cross.{integer|float} (#2450) 

Use separate names for the integer and float  `luac.cross` binaries.  Also adds local/lua directory which is already supported by tools makefile to build LFS image.
This commit is contained in:
Gregor Hartmann 2018-08-11 19:28:01 +02:00 committed by Terry Ellison
parent a57fe552e8
commit 91656c3d76
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/lua/luac_cross/Makefile
View File

@ -1,7 +1,7 @@
# #
# This Make file is called from the core Makefile hierarchy with is a hierarchical # This Make file 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:
@ -51,7 +51,12 @@ CC := $(WRAPCC) gcc
ECHO := echo ECHO := echo
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 IMAGE := ../../../luac.cross
else
IMAGE := ../../../luac.cross.int
endif
.PHONY: test clean all .PHONY: test clean all
@ -65,6 +70,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)

4
local/lua/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
# Ignore everything
*
# But not this file itself.
!.gitignore

15
tools/Makefile
View File

@ -2,8 +2,8 @@
# Options # Options
# #
FSSOURCE ?= ../local/fs/ FSSOURCE ?= ../local/fs
LUASOURCE ?= ../local/lua/ LUASOURCE ?= ../local/lua
FLASHSIZE ?= 4mb 32mb 8mb FLASHSIZE ?= 4mb 32mb 8mb
FLASH_SW = -S FLASH_SW = -S
SUBDIRS = SUBDIRS =
@ -14,7 +14,7 @@ OBJDUMP = $(or $(shell which objdump),xtensa-lx106-elf-objdump)
# Get the files to pack into the spiffs image # Get the files to pack into the spiffs image
# #
SPIFFSFILES ?= $(patsubst $(FSSOURCE)%,%,$(shell find $(FSSOURCE) -name '*' '!' -name .gitignore )) SPIFFSFILES ?= $(patsubst $(FSSOURCE)/%,%,$(shell find $(FSSOURCE)/ -name '*' '!' -name .gitignore ))
################################################################# #################################################################
# Get the filesize of /bin/0x10000.bin and SPIFFS sizing # Get the filesize of /bin/0x10000.bin and SPIFFS sizing
@ -36,6 +36,13 @@ endif
LFSSOURCES := $(wildcard $(LUASOURCE)/*.lua) LFSSOURCES := $(wildcard $(LUASOURCE)/*.lua)
BUILD_TYPE := $(shell $(CC) $(EXTRA_CCFLAGS) -E -dM - <../app/include/user_config.h | grep LUA_NUMBER_INTEGRAL | wc -l)
ifeq ($(BUILD_TYPE),0)
LUAC_CROSS := ../luac.cross
else
LUAC_CROSS := ../luac.cross.int
endif
############################################################# #############################################################
# Rules base # Rules base
# #
@ -72,7 +79,7 @@ spiffsscript: remove-image LFSimage spiffsimg/spiffsimg
ifneq ($(LFSSOURCES),) ifneq ($(LFSSOURCES),)
LFSimage: $(LFSSOURCES) LFSimage: $(LFSSOURCES)
../luac.cross -f -o $(FSSOURCE)flash.img $(LFSSOURCES) $(LUAC_CROSS) -f -o $(FSSOURCE)flash.img $(LFSSOURCES)
else else
LFSimage: LFSimage:
rm -f $(FSSOURCE)flash.img rm -f $(FSSOURCE)flash.img