diff options
author | 2022-11-30 01:11:48 -0300 | |
---|---|---|
committer | 2022-12-03 07:52:41 -0300 | |
commit | 671c3f24923d53bae96c8ef4989c250a5ce787c3 (patch) | |
tree | 171900a03c4da7962f382304e26bd7cee312e8a6 | |
parent | configure*: print CC and CFLAGS (diff) | |
download | firejail-671c3f24923d53bae96c8ef4989c250a5ce787c3.tar.gz firejail-671c3f24923d53bae96c8ef4989c250a5ce787c3.tar.zst firejail-671c3f24923d53bae96c8ef4989c250a5ce787c3.zip |
build: actually set LDFLAGS and LIBS in makefiles
Both variables are used inside on src/prog.mk and src/so.mk, but they
are not currently defined in any makefile, so their values cannot be
substituted by ./configure.
This means that the variables can be set when running make (such as with
`make LDFLAGS=-Lfoo`), but changing them in configure.ac has no effect.
The same applies when trying to set them when running ./configure (such
as with `./configure LDFLAGS=-Lfoo`).
-rw-r--r-- | config.mk.in | 2 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | configure.ac | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/config.mk.in b/config.mk.in index 9973b7eaa..45269afab 100644 --- a/config.mk.in +++ b/config.mk.in | |||
@@ -53,6 +53,8 @@ MANFLAGS = $(HAVE_LTS) $(HAVE_OUTPUT) $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_AP | |||
53 | 53 | ||
54 | CC=@CC@ | 54 | CC=@CC@ |
55 | CFLAGS=@CFLAGS@ | 55 | CFLAGS=@CFLAGS@ |
56 | LDFLAGS=@LDFLAGS@ | ||
57 | LIBS=@LIBS@ | ||
56 | 58 | ||
57 | ifdef NO_EXTRA_CFLAGS | 59 | ifdef NO_EXTRA_CFLAGS |
58 | else | 60 | else |
@@ -5260,8 +5260,10 @@ cat <<EOF | |||
5260 | Compile options: | 5260 | Compile options: |
5261 | CC: $CC | 5261 | CC: $CC |
5262 | CFLAGS: $CFLAGS | 5262 | CFLAGS: $CFLAGS |
5263 | LDFLAGS: $LDFLAGS | ||
5263 | EXTRA_CFLAGS: $EXTRA_CFLAGS | 5264 | EXTRA_CFLAGS: $EXTRA_CFLAGS |
5264 | EXTRA_LDFLAGS: $EXTRA_LDFLAGS | 5265 | EXTRA_LDFLAGS: $EXTRA_LDFLAGS |
5266 | LIBS: $LIBS | ||
5265 | fatal warnings: $HAVE_FATAL_WARNINGS | 5267 | fatal warnings: $HAVE_FATAL_WARNINGS |
5266 | gcov instrumentation: $HAVE_GCOV | 5268 | gcov instrumentation: $HAVE_GCOV |
5267 | install as a SUID executable: $HAVE_SUID | 5269 | install as a SUID executable: $HAVE_SUID |
diff --git a/configure.ac b/configure.ac index 49ad265e3..416d79682 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -293,8 +293,10 @@ cat <<EOF | |||
293 | Compile options: | 293 | Compile options: |
294 | CC: $CC | 294 | CC: $CC |
295 | CFLAGS: $CFLAGS | 295 | CFLAGS: $CFLAGS |
296 | LDFLAGS: $LDFLAGS | ||
296 | EXTRA_CFLAGS: $EXTRA_CFLAGS | 297 | EXTRA_CFLAGS: $EXTRA_CFLAGS |
297 | EXTRA_LDFLAGS: $EXTRA_LDFLAGS | 298 | EXTRA_LDFLAGS: $EXTRA_LDFLAGS |
299 | LIBS: $LIBS | ||
298 | fatal warnings: $HAVE_FATAL_WARNINGS | 300 | fatal warnings: $HAVE_FATAL_WARNINGS |
299 | gcov instrumentation: $HAVE_GCOV | 301 | gcov instrumentation: $HAVE_GCOV |
300 | install as a SUID executable: $HAVE_SUID | 302 | install as a SUID executable: $HAVE_SUID |