[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] build: don't export building_out_of_srctree
commit e1b8adf9f39cf192e1e05f76d903b99fe87e5116 Author: Jan Beulich <jbeulich@xxxxxxxx> AuthorDate: Fri May 5 09:10:28 2023 +0200 Commit: Jan Beulich <jbeulich@xxxxxxxx> CommitDate: Fri May 5 09:10:28 2023 +0200 build: don't export building_out_of_srctree I don't view a variable of this name as suitable for exporting, the more that it carries entirely redundant information. The reasons for its introduction in Linux commit 051f278e9d81 ("kbuild: replace KBUILD_SRCTREE with boolean building_out_of_srctree") also don't apply to us. Ditch exporting of the variable, replacing uses suitably. Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx> Reviewed-by: Anthony PERARD <anthony.perard@xxxxxxxxxx> --- xen/Makefile | 2 +- xen/arch/x86/boot/Makefile | 2 +- xen/scripts/Makefile.host | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 5166403cff..745a3fadab 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -208,7 +208,7 @@ endif objtree := . VPATH := $(srctree) -export building_out_of_srctree srctree objtree VPATH +export srctree objtree VPATH export XEN_ROOT := $(abs_srctree)/.. diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile index d6bc8fc084..03d8ce3a9e 100644 --- a/xen/arch/x86/boot/Makefile +++ b/xen/arch/x86/boot/Makefile @@ -14,7 +14,7 @@ $(obj)/head.o: $(head-bin-objs:.o=.bin) CFLAGS_x86_32 := $(subst -m64,-m32 -march=i686,$(XEN_TREEWIDE_CFLAGS)) $(call cc-options-add,CFLAGS_x86_32,CC,$(EMBEDDED_EXTRA_CFLAGS)) CFLAGS_x86_32 += -Werror -fno-builtin -g0 -msoft-float -ifdef building_out_of_srctree +ifneq ($(abs_objtree),$(abs_srctree)) CFLAGS_x86_32 += -I$(objtree)/include endif CFLAGS_x86_32 += -I$(srctree)/include diff --git a/xen/scripts/Makefile.host b/xen/scripts/Makefile.host index d6c358095e..ed24847575 100644 --- a/xen/scripts/Makefile.host +++ b/xen/scripts/Makefile.host @@ -88,7 +88,7 @@ _hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \ $(HOSTCXXFLAGS_$(target-stem).o) # $(objtree)/$(obj) for including generated headers from checkin source files -ifdef building_out_of_srctree +ifneq ($(abs_objtree),$(abs_srctree)) _hostc_flags += -I $(objtree)/$(obj) _hostcxx_flags += -I $(objtree)/$(obj) endif -- generated by git-patchbot for /home/xen/git/xen.git#master
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |