diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-07-02 22:19:48 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-01-19 11:40:34 -0300 |
commit | 5b1bd33c7dc1b96cc27e4e52e8bdfe63268887e9 (patch) | |
tree | 9b9920abdf4c4881bf85ae2d08a44ed097f9209b /config.mk.in | |
parent | modif: Change errExit msg format to match assert (diff) | |
download | firejail-5b1bd33c7dc1b96cc27e4e52e8bdfe63268887e9.tar.gz firejail-5b1bd33c7dc1b96cc27e4e52e8bdfe63268887e9.tar.zst firejail-5b1bd33c7dc1b96cc27e4e52e8bdfe63268887e9.zip |
build: use full paths on compile/link targets
This makes the compile commands clearer when building in parallel (with
`make -j`) and ensures that `__FILE__` includes the full build-time path
(relative to the root of the repository) whenever it is referenced, such
as in failed assert() messages (currently the full path is only shown in
errExit() messages). Example:
Before:
firejail: main.c:100: main: Assertion `1 == 2' failed.
Error src/firecfg/main.c:100: main: malloc: Cannot allocate memory
After:
firejail: ../../src/firejail/main.c:100: main: Assertion `1 == 2' failed.
Error ../../src/firecfg/main.c:100: main: malloc: Cannot allocate memory
Commands used to search and replace:
$ git grep -Ilz '^MOD_DIR =' -- '*Makefile' | xargs -0 -I '{}' \
sh -c "printf '%s\n' \"\$(sed -E \
-e 's|^MOD_DIR = src/(.*)|MOD = \\1\\nMOD_DIR = \$(ROOT)/src/\$(MOD)|' \
-e 's:^(PROG|SO) = [^.]+(\.so)?$:\\1 = \$(MOD_DIR)/\$(MOD)\2:' \
'{}')\" >'{}'"
$ git grep -Ilz '^HDRS :=' -- '*.mk' | xargs -0 -I '{}' \
sh -c "printf '%s\n' \"\$(sed -E \
-e 's|wildcard (\*\..)|wildcard \$(MOD_DIR)/\\1|' '{}')\" >'{}'"
Note: config.mk.in, src/fnettrace/Makefile and src/include/common.h were
edited manually.
This is a follow-up to #5871.
Diffstat (limited to 'config.mk.in')
-rw-r--r-- | config.mk.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.mk.in b/config.mk.in index 958efdb34..493a1f96f 100644 --- a/config.mk.in +++ b/config.mk.in | |||
@@ -81,7 +81,7 @@ LDFLAGS=@LDFLAGS@ | |||
81 | # Project variables | 81 | # Project variables |
82 | EXTRA_CFLAGS =@EXTRA_CFLAGS@ | 82 | EXTRA_CFLAGS =@EXTRA_CFLAGS@ |
83 | COMMON_CFLAGS = \ | 83 | COMMON_CFLAGS = \ |
84 | -ggdb -O2 -DVERSION='"$(VERSION)"' -DMOD_DIR='"$(MOD_DIR)"' \ | 84 | -ggdb -O2 -DVERSION='"$(VERSION)"' \ |
85 | -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ | 85 | -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ |
86 | -Wformat -Wformat-security \ | 86 | -Wformat -Wformat-security \ |
87 | -fstack-protector-all -D_FORTIFY_SOURCE=2 \ | 87 | -fstack-protector-all -D_FORTIFY_SOURCE=2 \ |