From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id EB49621CB74A4 for ; Wed, 25 Jul 2018 17:44:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 429FE40216E4; Thu, 26 Jul 2018 00:44:23 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-122-38.rdu2.redhat.com [10.10.122.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9542751E4; Thu, 26 Jul 2018 00:44:22 +0000 (UTC) From: Laszlo Ersek To: edk2-devel-01 Cc: Liming Gao , Yonghong Zhu Date: Thu, 26 Jul 2018 02:44:14 +0200 Message-Id: <20180726004415.13381-6-lersek@redhat.com> In-Reply-To: <20180726004415.13381-1-lersek@redhat.com> References: <20180726004415.13381-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 26 Jul 2018 00:44:23 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 26 Jul 2018 00:44:23 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: [PATCH 5/6] BaseTools/Source/C: take EXTRA_OPTFLAGS from the caller X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jul 2018 00:44:24 -0000 Allow the caller of the top-level makefile either to set EXTRA_OPTFLAGS in the environment or to pass EXTRA_OPTFLAGS as a macro definition on the command line. EXTRA_OPTFLAGS extends (and potentially overrides) default C compilation flags set in the makefiles. Cc: Liming Gao Cc: Yonghong Zhu Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Laszlo Ersek --- BaseTools/Source/C/Makefiles/header.makefile | 5 ++++- BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile | 5 ++++- BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile index 498c6cf48b4a..1b4cad5497ec 100644 --- a/BaseTools/Source/C/Makefiles/header.makefile +++ b/BaseTools/Source/C/Makefiles/header.makefile @@ -69,7 +69,10 @@ endif INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) BUILD_CPPFLAGS = $(INCLUDE) -BUILD_OPTFLAGS = -O2 + +# keep EXTRA_OPTFLAGS last +BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS) + ifeq ($(DARWIN),Darwin) # assume clang or clang compatible flags on OS X BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile index 94e6e7292309..cefe6a078b39 100644 --- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile +++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile @@ -165,7 +165,10 @@ PCCTS_H=../h # UNIX (default) # BUILD_CC?=gcc -COPT=-O + +# keep EXTRA_OPTFLAGS last +COPT=-O $(EXTRA_OPTFLAGS) + ANTLR=${BIN_DIR}/antlr DLG=${BIN_DIR}/dlg OBJ_EXT=o diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile index f4babb4b0790..a9d1771d4c5b 100644 --- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile +++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile @@ -115,7 +115,10 @@ PCCTS_H=../h # UNIX # BUILD_CC?=cc -COPT=-O + +# keep EXTRA_OPTFLAGS last +COPT=-O $(EXTRA_OPTFLAGS) + ANTLR=${BIN_DIR}/antlr DLG=${BIN_DIR}/dlg -- 2.14.1.3.gb7cf6e02401b