[xen staging] firmware/seabios: fix build on systems with non GNU toolchains

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen staging] firmware/seabios: fix build on systems with non GNU toolchains

patchbot
commit 1233d253a4cab502e26abef2c7d648788bb722ff
Author:     Roger Pau Monne <[hidden email]>
AuthorDate: Mon Jul 2 10:28:23 2018 +0200
Commit:     Wei Liu <[hidden email]>
CommitDate: Tue Jul 10 08:41:53 2018 +0100

    firmware/seabios: fix build on systems with non GNU toolchains
   
    SeaBIOS requires gcc and GNU ld in order to build, so allow setting
    SEABIOSCC and SEABIOSLD by the caller when building in order to pass
    the path to the compiler and linker that should be used when building
    SeaBIOS.
   
    Note that the LD32BIT-y variable was used by FreeBSD builds and is no
    longer needed due to the ability to select the LD to use for SeaBIOS
    builds, so remove it.
   
    Signed-off-by: Roger Pau Monné <[hidden email]>
    Acked-by: Wei Liu <[hidden email]>
---
 tools/firmware/Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index 5a7cf7766d..842b48c3d3 100644
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -19,7 +19,8 @@ SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
 SUBDIRS-$(CONFIG_PV_SHIM) += xen-dir
 SUBDIRS-y += hvmloader
 
-LD32BIT-$(CONFIG_FreeBSD) := LD32BIT_FLAG=-melf_i386_fbsd
+SEABIOSCC ?= $(CC)
+SEABIOSLD ?= $(LD)
 
 ovmf-dir:
  GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf-dir
@@ -28,7 +29,7 @@ ovmf-dir:
 seabios-dir:
  GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_REVISION) seabios-dir
  cp seabios-config seabios-dir/.config;
- $(MAKE) -C seabios-dir olddefconfig
+ $(MAKE) -C seabios-dir olddefconfig CC=$(SEABIOSCC) LD=$(SEABIOSLD)
 
 .PHONY: all
 all: $(SUBDIRS-y)
@@ -41,8 +42,7 @@ ifeq ($(CONFIG_ROMBIOS),y)
  false ; \
  fi
 endif
- $(MAKE) $(LD32BIT-y) CC=$(CC) PYTHON=$(PYTHON) subdirs-$@
-
+ $(MAKE) CC=$(CC) PYTHON=$(PYTHON) subdirs-$@
 
 .PHONY: install
 install: all
@@ -114,7 +114,7 @@ seabios-dir-force-update: seabios-dir
 
 subdir-clean-seabios-dir:
  set -e; if test -d seabios-dir/.; then \
- $(MAKE) -C seabios-dir clean; \
+ $(MAKE) -C seabios-dir CC=$(SEABIOSCC) LD=$(SEABIOSLD) clean; \
  fi
 
 subtree-force-update:
@@ -128,3 +128,6 @@ endif
 subtree-force-update-all:
  $(MAKE) seabios-dir-force-update
  $(MAKE) ovmf-dir-force-update
+
+subdir-all-seabios-dir: seabios-dir
+ $(MAKE) -C $< CC=$(SEABIOSCC) LD=$(SEABIOSLD) PYTHON=$(PYTHON) all;
--
generated by git-patchbot for /home/xen/git/xen.git#staging


_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog