rsys

commit 48fbd63396e730719b92e1fb6f0b7503d1dd696d
parent 36e2916dc34a4d37c7c8f74768e04534a24cb6c4
Author: vaplv <vaplv@free.fr>
Date:   Wed, 18 Oct 2023 10:06:29 +0200

Updating compiler and linker flag definitions

In both cases, there are two sets of macros. <C|LD>FLAGS_SO (for shared
objects) and <C|LD>FLAGS_EXE (for executables) defined from the
<C|LD>FLAGS_DEBUG or <C|LD>FLAGS_RELEASE macro. This commit (re)adds the
<C|LD>FLAGS macros that are by default defined as <C|LD>FLAGS_DEBUG or
<C|LD>FLAGS_RELEASE, depending on the value of BUILD_TYPE. Macros
<C|LD>FLAGS_SO and <C|LD>FLAGS_EXE are now defined from them.

This allows the compiler and linker flags for executables and shared
objects to be overwritten simply by updating the CFLAGS and LDFLAGS
macros. What's more, this is in line with the expected way of
proceeding, CFLAGS and LDFLAGS being standard macros.

Diffstat:
M
config.mk
 | 
10
++++++----

1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/config.mk b/config.mk
@@ -49,8 +49,9 @@ CFLAGS_COMMON =\
 
 CFLAGS_RELEASE = -O2 -DNDEBUG $(CFLAGS_COMMON)
 CFLAGS_DEBUG = -g $(CFLAGS_COMMON)
-CFLAGS_SO = $(CFLAGS_$(BUILD_TYPE)) -fPIC
-CFLAGS_EXE = $(CFLAGS_$(BUILD_TYPE)) -fPIE
+CFLAGS = $(CFLAGS_$(BUILD_TYPE))
+CFLAGS_SO = $(CFLAGS) -fPIC
+CFLAGS_EXE = $(CFLAGS) -fPIE
 
 ################################################################################
 # Linker options
@@ -60,9 +61,10 @@ LIBS = -ldl -lpthread -lm
 LDFLAGS_HARDENED = -Wl,-z,relro,-z,now
 LDFLAGS_DEBUG = $(LDFLAGS_HARDENED)
 LDFLAGS_RELEASE = -s $(LDFLAGS_HARDENED)
+LDFLAGS = $(LDFLAGS_$(BUILD_TYPE))
 
-LDFLAGS_SO = $(LDFLAGS_$(BUILD_TYPE)) -shared -Wl,--no-undefined
-LDFLAGS_EXE = $(LDFLAGS_$(BUILD_TYPE)) -pie
+LDFLAGS_SO = $(LDFLAGS) -shared -Wl,--no-undefined
+LDFLAGS_EXE = $(LDFLAGS) -pie
 
 OCPFLAGS_DEBUG = --localize-hidden
 OCPFLAGS_RELEASE = --localize-hidden --strip-unneeded