aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew G. Morgan <morgan@kernel.org>2022-07-22 07:22:57 -0700
committerAndrew G. Morgan <morgan@kernel.org>2022-07-22 07:22:57 -0700
commit7db9589038d88b88111582da7681d33e1177f636 (patch)
treeae240ba664c0f1afed6877ed5359c562d0c4b2df
parent27e801bcbcffadd8a9e3193f0c520b1f08535574 (diff)
downloadlibcap-7db9589038d88b88111582da7681d33e1177f636.tar.gz
Some more simplifications for building
I'm not 100% sure this is needed, but I'm not yet convinced 'make distclean && make -j48 test' works reliably, but I find this easier to reason about. Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
-rw-r--r--go/Makefile4
-rw-r--r--libcap/Makefile3
2 files changed, 6 insertions, 1 deletions
diff --git a/go/Makefile b/go/Makefile
index 342d93f..cd90765 100644
--- a/go/Makefile
+++ b/go/Makefile
@@ -24,8 +24,10 @@ $(DEPS):
../progs/tcapsh-static:
$(MAKE) -C ../progs tcapsh-static
-vendor/$(IMPORTDIR) vendor/modules.txt:
+vendor/$(IMPORTDIR):
mkdir -p "vendor/$(IMPORTDIR)"
+
+vendor/modules.txt: vendor/$(IMPORTDIR)
echo "# $(IMPORTDIR)/psx v$(GOMAJOR).$(VERSION).$(MINOR)" > vendor/modules.txt
echo "$(IMPORTDIR)/psx" >> vendor/modules.txt
echo "# $(IMPORTDIR)/cap v$(GOMAJOR).$(VERSION).$(MINOR)" >> vendor/modules.txt
diff --git a/libcap/Makefile b/libcap/Makefile
index 7a38fe9..f5dde3e 100644
--- a/libcap/Makefile
+++ b/libcap/Makefile
@@ -108,6 +108,9 @@ $(STAPSXLIBNAME): $(PSXOBJS) include/sys/psx_syscall.h
ifeq ($(SHARED),yes)
+empty: empty.c
+ $(CC) -o $@ $<
+
loader.txt: empty
$(OBJCOPY) --dump-section .interp=$@ $< /dev/null