aboutsummaryrefslogtreecommitdiffstats
path: root/src/etc-cleanup/Makefile
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-05-11 22:35:06 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-05-11 23:04:41 -0300
commit020ae580b657f96f78938f123841c9181d1b5036 (patch)
tree7f8e3c78cf49751db672c9c87390f7e59eedda81 /src/etc-cleanup/Makefile
parentblock local python (#5826) (diff)
downloadfirejail-020ae580b657f96f78938f123841c9181d1b5036.tar.gz
firejail-020ae580b657f96f78938f123841c9181d1b5036.tar.zst
firejail-020ae580b657f96f78938f123841c9181d1b5036.zip
etc-cleanup: fix wrong header path in Makefile
This is causing main.o to be built using an implicit rule (rather than the rule from src/prog.mk), which does not use PROG_CFLAGS. Example (using src/fldd as a working example for comparison): $ make -C src/etc-cleanup clean >/dev/null && make -C src/etc-cleanup | grep -Ev '(Entering|Leaving) directory' gcc -g -O2 -c -o main.o main.c gcc -pie -fPIE -Wl,-z,relro -Wl,-z,now -o etc-cleanup main.o $ make -C src/etc-cleanup clean >/dev/null && make -C src/etc-cleanup -r | grep -Ev '(Entering|Leaving) directory' make: *** No rule to make target 'main.o', needed by 'etc-cleanup'. Stop. $ make -C src/fldd clean >/dev/null && make -C src/fldd | grep -Ev '(Entering|Leaving) directory' gcc -ggdb -O2 -DVERSION='"0.9.73"' -fstack-protector-all [...] gcc -pie -fPIE -Wl,-z,relro -Wl,-z,now -o fldd main.o ../lib/common.o ../lib/ldd_utils.o $ make -C src/fldd clean >/dev/null && make -C src/fldd -r | grep -Ev '(Entering|Leaving) directory' gcc -ggdb -O2 -DVERSION='"0.9.73"' -fstack-protector-all [...] gcc -pie -fPIE -Wl,-z,relro -Wl,-z,now -o fldd main.o ../lib/common.o ../lib/ldd_utils.o Environment: GNU make 4.4.1-2 on Artix Linux. This amends commit e889db095 ("build fix", 2023-02-06). See also commit 02d37680c ("private-etc rework: file groups moved to src/include/etc_groups.h, new groups added", 2023-01-25). Relates to #5610.
Diffstat (limited to 'src/etc-cleanup/Makefile')
-rw-r--r--src/etc-cleanup/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc-cleanup/Makefile b/src/etc-cleanup/Makefile
index 349da8821..10c28cd76 100644
--- a/src/etc-cleanup/Makefile
+++ b/src/etc-cleanup/Makefile
@@ -4,6 +4,6 @@ ROOT = ../..
4PROG = etc-cleanup 4PROG = etc-cleanup
5TARGET = $(PROG) 5TARGET = $(PROG)
6 6
7MOD_HDRS = ../include/etc-groups.h 7MOD_HDRS = ../include/etc_groups.h
8 8
9include $(ROOT)/src/prog.mk 9include $(ROOT)/src/prog.mk