[dm-devel] [PATCH] multipath-tools: Makefile: Respect standard toolchain related envvars

[Martin Wilck]

On Thu, 2017-11-30 at 00:23 +0100, Thomas Deutschmann wrote:
> The Makefile overrides standard envvars that control the toolchain
> flags.
> This patch should set things right without reducing default behavior.

I apologize for the very late reply. 

I'm not sure what you mean with "standard envvars" here. Is it "CFLAGS"
and "LDFLAGS"? If that's what you mean, I disagree. 

CFLAGS handling is correct this way - CFLAGS should represent the final
list of options passed to the compiler. Typically the Makefile
assembles this list from internal project settings and user input.

Currently, setting OPTFLAGS is the preferred way to customize
multipath-tools build.

If changes are needed, I'd prefer Bart's suggestion.

Martin


> 
> Signed-off-by: Thomas Deutschmann <whissi at gentoo.org>
> ---
>  Makefile.inc | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile.inc b/Makefile.inc
> index 29c290a2..951d58fc 100644
> --- a/Makefile.inc
> +++ b/Makefile.inc
> @@ -90,11 +90,12 @@ OPTFLAGS	= -O2 -g -pipe -Wall -Wextra
> -Wformat=2 -Werror=implicit-int \
>  		  -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \
>  		  --param=ssp-buffer-size=4
>  
> -CFLAGS		= $(OPTFLAGS) -DLIB_STRING=\"${LIB}\"
> -DRUN_DIR=\"${RUN}\"
> +CFLAGS		?= $(OPTFLAGS)
> +CFLAGS		+= -DLIB_STRING=\"${LIB}\"
> -DRUN_DIR=\"${RUN}\"
>  BIN_CFLAGS	= -fPIE -DPIE
>  LIB_CFLAGS	= -fPIC
>  SHARED_FLAGS	= -shared
> -LDFLAGS		= -Wl,-z,relro -Wl,-z,now
> +LDFLAGS		+= -Wl,-z,relro -Wl,-z,now
>  BIN_LDFLAGS	= -pie
>  
>  # Check whether a function with name $1 has been declared in header
> file $2.

-- 
Dr. Martin Wilck <mwilck at suse.com>, Tel. +49 (0)911 74053 2107
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)