diff options
author | Topi Miettinen <topimiettinen@users.noreply.github.com> | 2020-05-04 22:09:33 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-04 22:09:33 +0000 |
commit | b4f47adc3da06666369798d531a9c93efc684708 (patch) | |
tree | b30e5a69c5ad23aee469f9924d4a3c859e668fe3 | |
parent | Follow-up for #3326 (#3397) (diff) | |
download | firejail-b4f47adc3da06666369798d531a9c93efc684708.tar.gz firejail-b4f47adc3da06666369798d531a9c93efc684708.tar.zst firejail-b4f47adc3da06666369798d531a9c93efc684708.zip |
Build improvements (#3401)
Don't build all filters many times over but instead let them be built
in parallel.
Closes #3393
-rw-r--r-- | Makefile.in | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index e7ccba14b..5b8655fca 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -28,12 +28,12 @@ SECCOMP_FILTERS = seccomp seccomp.debug seccomp.32 seccomp.block_secondary secco | |||
28 | endif | 28 | endif |
29 | ALL_ITEMS = $(APPS) $(SBOX_APPS) $(MYLIBS) | 29 | ALL_ITEMS = $(APPS) $(SBOX_APPS) $(MYLIBS) |
30 | 30 | ||
31 | .PHONY: all_items $(ALL_ITEMS) | 31 | .PHONY: all_items man filters |
32 | all_items: $(ALL_ITEMS) | 32 | all_items: $(ALL_ITEMS) |
33 | $(ALL_ITEMS): $(MYDIRS) | 33 | $(ALL_ITEMS): $(MYDIRS) |
34 | $(MAKE) -C $(dir $@) | 34 | $(MAKE) -C $(dir $@) |
35 | 35 | ||
36 | .PHONY: mydirs $(MYDIRS) | 36 | .PHONY: mydirs |
37 | mydirs: $(MYDIRS) | 37 | mydirs: $(MYDIRS) |
38 | $(MYDIRS): | 38 | $(MYDIRS): |
39 | $(MAKE) -C $@ | 39 | $(MAKE) -C $@ |
@@ -45,15 +45,25 @@ man: $(MANPAGES) | |||
45 | 45 | ||
46 | filters: $(SECCOMP_FILTERS) $(SBOX_APPS) | 46 | filters: $(SECCOMP_FILTERS) $(SBOX_APPS) |
47 | ifeq ($(HAVE_SECCOMP),-DHAVE_SECCOMP) | 47 | ifeq ($(HAVE_SECCOMP),-DHAVE_SECCOMP) |
48 | $(SECCOMP_FILTERS): $(SBOX_APPS) | 48 | seccomp: src/fseccomp/fseccomp src/fsec-optimize/fsec-optimize |
49 | src/fseccomp/fseccomp default seccomp | 49 | src/fseccomp/fseccomp default seccomp |
50 | src/fsec-optimize/fsec-optimize seccomp | 50 | src/fsec-optimize/fsec-optimize seccomp |
51 | |||
52 | seccomp.debug: src/fseccomp/fseccomp src/fsec-optimize/fsec-optimize | ||
51 | src/fseccomp/fseccomp default seccomp.debug allow-debuggers | 53 | src/fseccomp/fseccomp default seccomp.debug allow-debuggers |
52 | src/fsec-optimize/fsec-optimize seccomp.debug | 54 | src/fsec-optimize/fsec-optimize seccomp.debug |
55 | |||
56 | seccomp.32: src/fseccomp/fseccomp src/fsec-optimize/fsec-optimize | ||
53 | src/fseccomp/fseccomp secondary 32 seccomp.32 | 57 | src/fseccomp/fseccomp secondary 32 seccomp.32 |
54 | src/fsec-optimize/fsec-optimize seccomp.32 | 58 | src/fsec-optimize/fsec-optimize seccomp.32 |
59 | |||
60 | seccomp.block_secondary: src/fseccomp/fseccomp | ||
55 | src/fseccomp/fseccomp secondary block seccomp.block_secondary | 61 | src/fseccomp/fseccomp secondary block seccomp.block_secondary |
62 | |||
63 | seccomp.mdwx: src/fseccomp/fseccomp | ||
56 | src/fseccomp/fseccomp memory-deny-write-execute seccomp.mdwx | 64 | src/fseccomp/fseccomp memory-deny-write-execute seccomp.mdwx |
65 | |||
66 | seccomp.mdwx.32: src/fseccomp/fseccomp | ||
57 | src/fseccomp/fseccomp memory-deny-write-execute.32 seccomp.mdwx.32 | 67 | src/fseccomp/fseccomp memory-deny-write-execute.32 seccomp.mdwx.32 |
58 | endif | 68 | endif |
59 | 69 | ||