From patchwork Wed Nov 29 23:23:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Deutschmann X-Patchwork-Id: 10084465 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2AD1A6035E for ; Thu, 30 Nov 2017 09:31:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14CCF29F1B for ; Thu, 30 Nov 2017 09:31:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08C1629F1D; Thu, 30 Nov 2017 09:31:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8D86029F1B for ; Thu, 30 Nov 2017 09:31:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 02C6183F3F; Thu, 30 Nov 2017 09:31:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 33BEE6062E; Thu, 30 Nov 2017 09:31:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8F6304BB79; Thu, 30 Nov 2017 09:31:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vATNNknZ023914 for ; Wed, 29 Nov 2017 18:23:46 -0500 Received: by smtp.corp.redhat.com (Postfix) id 837865D6A8; Wed, 29 Nov 2017 23:23:46 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx06.extmail.prod.ext.phx2.redhat.com [10.5.110.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7D0545D6A3 for ; Wed, 29 Nov 2017 23:23:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CB7A0356C2 for ; Wed, 29 Nov 2017 23:23:43 +0000 (UTC) Received: from vm-gentoo-x64.intern.deutschmann.biz (2001-4dd3-9a98-0-6ba1-6c36-2233-bd94.ipv6dyn.netcologne.de [IPv6:2001:4dd3:9a98:0:6ba1:6c36:2233:bd94]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: whissi) by smtp.gentoo.org (Postfix) with ESMTPSA id 95C1C33BF05 for ; Wed, 29 Nov 2017 23:23:42 +0000 (UTC) From: Thomas Deutschmann To: dm-devel@redhat.com Date: Thu, 30 Nov 2017 00:23:11 +0100 Message-Id: <20171129232311.95483-1-whissi@gentoo.org> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 29 Nov 2017 23:23:44 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 29 Nov 2017 23:23:44 +0000 (UTC) for IP:'140.211.166.183' DOMAIN:'smtp.gentoo.org' HELO:'smtp.gentoo.org' FROM:'whissi@gentoo.org' RCPT:'' X-RedHat-Spam-Score: -5.012 (RCVD_IN_DNSWL_HI, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD) 140.211.166.183 smtp.gentoo.org 140.211.166.183 smtp.gentoo.org X-Scanned-By: MIMEDefang 2.78 on 10.5.110.30 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: dm-devel@redhat.com X-Mailman-Approved-At: Thu, 30 Nov 2017 04:31:18 -0500 Subject: [dm-devel] [PATCH] multipath-tools: Makefile: Respect standard toolchain related envvars X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 30 Nov 2017 09:31:25 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP The Makefile overrides standard envvars that control the toolchain flags. This patch should set things right without reducing default behavior. Signed-off-by: Thomas Deutschmann --- 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.