diff options
| author | Andrew G. Morgan <morgan@kernel.org> | 2021-09-05 19:50:07 -0700 |
|---|---|---|
| committer | Andrew G. Morgan <morgan@kernel.org> | 2021-09-05 20:07:48 -0700 |
| commit | 8b3ffc23b6cbe42d2eac5a3c0d970fd26472a246 (patch) | |
| tree | 54932fb39f39721eaf33585f9e57d11fa6a59aba | |
| parent | f223de46154a3d2644914ea358d5c69b36770459 (diff) | |
| download | libcap2-8b3ffc23b6cbe42d2eac5a3c0d970fd26472a246.tar.gz | |
Fixed parallel make issues
Tried make -j12 and these fixes were needed.
Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
| -rw-r--r-- | go/Makefile | 2 | ||||
| -rw-r--r-- | libcap/Makefile | 2 | ||||
| -rw-r--r-- | progs/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/go/Makefile b/go/Makefile index 2b2061b..3f192cd 100644 --- a/go/Makefile +++ b/go/Makefile @@ -94,7 +94,7 @@ endif b210613: b210613.go CAPGOPACKAGE CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build -mod=vendor $< -test: all $(TESTS) +test: setid gowns captree $(TESTS) CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) $(GO) test -mod=vendor $(IMPORTDIR)/psx CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) $(GO) test -mod=vendor $(IMPORTDIR)/cap LD_LIBRARY_PATH=../libcap ./compare-cap diff --git a/libcap/Makefile b/libcap/Makefile index 84340f2..7706063 100644 --- a/libcap/Makefile +++ b/libcap/Makefile @@ -130,7 +130,7 @@ endif cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ -cap_test: cap_test.c libcap.h $(CAPOBJS) +cap_test: cap_test.c $(INCLS) $(CAPOBJS) $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< $(CAPOBJS) -o $@ libcapsotest: $(CAPLIBNAME) diff --git a/progs/Makefile b/progs/Makefile index e2bd7fe..846bd76 100644 --- a/progs/Makefile +++ b/progs/Makefile @@ -61,7 +61,7 @@ uns_test: ../tests/uns_test.c $(MAKE) -C ../tests uns_test cp ../tests/uns_test . -sudotest: tcapsh-static uns_test +sudotest: tcapsh-static uns_test capsh setcap getcap tcapsh-static $(SUDO) $(LDPATH) ./quicktest.sh clean: |