diff options
| author |  Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-06-26 03:47:23 -0300 |
|---|---|---|
| committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-06-26 10:48:56 -0300 |
| commit | 810b75bbf36c18dbacc713f5de18ab64360295c9 (patch) | |
| tree | 06ac882b407607f78e54a1d97b7912d52f2d773f | |
| parent | build: standardize common CFLAGS (diff) | |
| download | firejail-810b75bbf36c18dbacc713f5de18ab64360295c9.tar.gz firejail-810b75bbf36c18dbacc713f5de18ab64360295c9.tar.zst firejail-810b75bbf36c18dbacc713f5de18ab64360295c9.zip | |
build: set EXTRA_CFLAGS/EXTRA_LDFLAGS instead of append
This allows overriding them when calling make.
| -rw-r--r-- | config.mk.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config.mk.in b/config.mk.in index 89d401dfd..f3c1f658c 100644 --- a/config.mk.in +++ b/config.mk.in | |||
| @@ -81,7 +81,7 @@ CFLAGS=@CFLAGS@ | |||
| 81 | LDFLAGS=@LDFLAGS@ | 81 | LDFLAGS=@LDFLAGS@ |
| 82 | 82 | ||
| 83 | # Project variables | 83 | # Project variables |
| 84 | EXTRA_CFLAGS +=@EXTRA_CFLAGS@ | 84 | EXTRA_CFLAGS =@EXTRA_CFLAGS@ |
| 85 | COMMON_CFLAGS = \ | 85 | COMMON_CFLAGS = \ |
| 86 | -ggdb -O2 -DVERSION='"$(VERSION)"' \ | 86 | -ggdb -O2 -DVERSION='"$(VERSION)"' \ |
| 87 | -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ | 87 | -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ |
| @@ -101,9 +101,9 @@ SO_CFLAGS = \ | |||
| 101 | $(COMMON_CFLAGS) \ | 101 | $(COMMON_CFLAGS) \ |
| 102 | -fPIC | 102 | -fPIC |
| 103 | 103 | ||
| 104 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | 104 | EXTRA_LDFLAGS =@EXTRA_LDFLAGS@ |
| 105 | PROG_LDFLAGS = -Wl,-z,relro -Wl,-z,now -fPIE -pie $(EXTRA_LDFLAGS) | 105 | PROG_LDFLAGS = -Wl,-z,relro -Wl,-z,now -fPIE -pie $(EXTRA_LDFLAGS) |
| 106 | SO_LDFLAGS = -Wl,-z,relro -Wl,-z,now -fPIC | 106 | SO_LDFLAGS = -Wl,-z,relro -Wl,-z,now -fPIC |
| 107 | LIBS =@LIBS@ | 107 | LIBS =@LIBS@ |
| 108 | 108 | ||
| 109 | CLEANFILES = *.o *.gcov *.gcda *.gcno *.plist | 109 | CLEANFILES = *.o *.gcov *.gcda *.gcno *.plist |