build-pkg: build nonet and check-reqs early, ignore .waf* artefacts

This commit is contained in:
Tony Theodore 2018-03-11 14:55:48 +11:00
parent 38c43b5017
commit 4f21088b48
2 changed files with 5 additions and 1 deletions

View File

@ -674,6 +674,9 @@ $(NONET_LIB): $(TOP_DIR)/tools/nonetwork.c | $(PREFIX)/$(BUILD)/lib/.gitkeep
@$(PRINTF_FMT) '[nonet lib]' '$@'
+@$(BUILD_CC) -shared -fPIC $(NONET_CFLAGS) -o $@ $<
.PHONY: nonet-lib
nonet-lib: $(NONET_LIB)
.PHONY: shell
shell: $(NONET_LIB)
$(PRELOAD) $(SHELL)

View File

@ -439,6 +439,7 @@ end
local function gitInit()
os.execute('mkdir -p ./usr')
os.execute(GIT .. 'init --quiet')
os.execute('echo .waf* >> ./usr/.git/info/exclude')
end
local function gitTag(name)
@ -1096,7 +1097,7 @@ local function main()
MXE_DIR, MXE_DIR_EXPECTED)
end
gitInit()
assert(execute(("%s check-requirements MXE_TARGETS=%q"):format(
assert(execute(("%s check-requirements nonet-lib print-git-oneline MXE_TARGETS=%q"):format(
tool 'make', table.concat(TARGETS, ' '))))
if not max_items then
downloadPackages()