diff options
| author | Tony Theodore <tonyt@logyst.com> | 2018-03-11 03:55:48 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2018-03-12 03:28:14 (GMT) |
| commit | 4f21088b48d540a26cdefdae01b69f743a1a0d71 (patch) | |
| tree | 1ceaee72775da775a74237b2eef2bef305cab9df | |
| parent | 38c43b5017befbf0153d3a5f2165e80c064329ad (diff) | |
| download | mxe-4f21088b48d540a26cdefdae01b69f743a1a0d71.zip mxe-4f21088b48d540a26cdefdae01b69f743a1a0d71.tar.gz mxe-4f21088b48d540a26cdefdae01b69f743a1a0d71.tar.bz2 | |
build-pkg: build nonet and check-reqs early, ignore .waf* artefacts
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | tools/build-pkg.lua | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -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) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 90949c6..0f9998f 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -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() |