From 9c08da15bd18d5a131fef5d6937ad9103f20340d Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Fri, 23 Jun 2023 08:59:43 -0300 Subject: build: move common CFLAGS/LDFLAGS first --- src/prog.mk | 6 +++--- src/so.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/prog.mk b/src/prog.mk index 5ed706da9..38cf714db 100644 --- a/src/prog.mk +++ b/src/prog.mk @@ -14,14 +14,14 @@ PROG_CFLAGS = \ -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ -Wformat -Wformat-security \ -fstack-protector-all -D_FORTIFY_SOURCE=2 \ - -fPIE \ -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' \ -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' \ -DVARDIR='"/var/lib/firejail"' \ $(HAVE_GCOV) $(MANFLAGS) \ - $(EXTRA_CFLAGS) + $(EXTRA_CFLAGS) \ + -fPIE -PROG_LDFLAGS = -pie -fPIE -Wl,-z,relro -Wl,-z,now $(EXTRA_LDFLAGS) +PROG_LDFLAGS = -Wl,-z,relro -Wl,-z,now -fPIE -pie $(EXTRA_LDFLAGS) .PHONY: all all: $(TARGET) diff --git a/src/so.mk b/src/so.mk index 7a8d09e89..ec0947933 100644 --- a/src/so.mk +++ b/src/so.mk @@ -16,7 +16,7 @@ SO_CFLAGS = \ -fstack-protector-all -D_FORTIFY_SOURCE=2 \ -fPIC -SO_LDFLAGS = -fPIC -Wl,-z,relro -Wl,-z,now +SO_LDFLAGS = -Wl,-z,relro -Wl,-z,now -fPIC .PHONY: all all: $(TARGET) -- cgit v1.2.3-70-g09d2