[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] x86/boot: use BASEDIR for include path
- To: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
- From: Bertrand Marquis <Bertrand.Marquis@xxxxxxx>
- Date: Thu, 11 Jun 2020 16:50:56 +0000
- Accept-language: en-GB, en-US
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=az1n7mvnDXCinM24Yx3x0/8T7adMMETwnUXKvJX82MM=; b=fCzLYMyPpo7xKX0Aawca+N15ywBiIKeYsrQtghCY7FDw0buPKfmRdiwbMv4bT+xyXzWLyIE9P8yv8uMg/O884b2aH5hYfvMQQY+hA0Sv9QrrU+zmPeMhfXZJ/ff8EhaoDBISFMPvgS/+GqWpICIsB3Hv3q3qg62kV8SadgkSWUeydTD5UXVGUqYlOZY4WcPQ18ecFXY07eumCErHKgnMJHP8K209S3jeuCTADCSFHhiY/zmEWVQ3TUH9qfaFsfTicRvjsjETobPcEo+cms3gN2S575Mg8ZWYpwtH+Xpn0pRj56CAp7nNm2nop7pDu37vASLoR/CoEDSmVKnKj68MdA==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oe5eY4DO9y7hqa7SkkVX2M4mC0qYQ+LbeL9XphH9Rly3Rha2rc3Z2POP8Rz2/Ei1sT1xpber5y/PAI8g+p574NavEen46iYLZDW3fejcFgOThokOVGmZjiybSbahmxoBrDWP3SyXrq86CVkzt80UHwbZ23XNRIDsP53ZOE3EDfplznGhTs+0fesd9CeommKyR2U5BxDZ9SkkpZYRMMsYfu1a0LXH5nPGFGR0I1OEbQa7D8D+v4yNPeLCWdxdUuVYmLYtNRobMjnal5NQhSfl46ZrhSajaBOzzmZkMumGQSd2f4TxJ0MokcJ9yFQD6hljsd1l7+Gr5Qx1uFYcMfXd/Q==
- Authentication-results-original: citrix.com; dkim=none (message not signed) header.d=none;citrix.com; dmarc=none action=none header.from=arm.com;
- Cc: xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>, nd <nd@xxxxxxx>, Wei Liu <wl@xxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>
- Delivery-date: Thu, 11 Jun 2020 16:51:25 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Nodisclaimer: true
- Original-authentication-results: citrix.com; dkim=none (message not signed) header.d=none;citrix.com; dmarc=none action=none header.from=arm.com;
- Thread-index: AQHWP+cTsx4T9bxcEUCqkorIalLVuajTmc4AgAAHVoA=
- Thread-topic: [PATCH] x86/boot: use BASEDIR for include path
Hi Andrew,
> On 11 Jun 2020, at 17:24, Andrew Cooper <andrew.cooper3@xxxxxxxxxx> wrote:
>
> On 11/06/2020 12:54, Bertrand Marquis wrote:
>> Use $(BASEDIR)/include instead of $(XEN_ROOT)/xen/include for the
>> include path to be coherent with the rest of the Makefiles.
>>
>> Signed-off-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
>
> Does something subtle break before this change?
Without changing anything no.
But if xen sub-directory is renamed yes.
As there is no easy way to build xen hypervisor out of tree (I might be wrong
here !) I found a solution using cp -rs from xen subdir in a xen-build1
xen-build2 etc this way I can check build for x86 and arm without cleaning.
Without the patch, the sources are actually compiles with an include path
containing xen/../xen as a result of using XEN_ROOT which does not allow to
rename xen subdirectory.
As it was the only place in which XEN_ROOT was used for include paths, this is
normalising the paths.
Bertrand
>
> ~Andrew
>
>> ---
>> xen/arch/x86/boot/build32.mk | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk
>> index 5851ebff5f..8cd5403926 100644
>> --- a/xen/arch/x86/boot/build32.mk
>> +++ b/xen/arch/x86/boot/build32.mk
>> @@ -5,7 +5,7 @@ include $(XEN_ROOT)/Config.mk
>> $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
>>
>> CFLAGS += -Werror -fno-builtin -g0 -msoft-float
>> -CFLAGS += -I$(XEN_ROOT)/xen/include
>> +CFLAGS += -I$(BASEDIR)/include
>> CFLAGS := $(filter-out -flto,$(CFLAGS))
>>
>> # NB. awk invocation is a portable alternative to 'head -n -1'
>
|
