diff options
| author | Peter Maydell | 2019-01-11 17:45:59 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-01-11 17:45:59 +0100 |
| commit | 27df21ca3886fff4dd3d70e515517667963a52f1 (patch) | |
| tree | e9248f94b178173fbcc0550b5459d72413a575bf | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| parent | roms: seabios: Rename CROSS_COMPILE to CROSS_PREFIX (diff) | |
| download | qemu-27df21ca3886fff4dd3d70e515517667963a52f1.tar.gz qemu-27df21ca3886fff4dd3d70e515517667963a52f1.tar.xz qemu-27df21ca3886fff4dd3d70e515517667963a52f1.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/misc-20190111-pull-request' into staging
misc: fix seabios cross build.
# gpg: Signature made Fri 11 Jan 2019 11:46:47 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/misc-20190111-pull-request:
roms: seabios: Rename CROSS_COMPILE to CROSS_PREFIX
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | roms/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roms/Makefile b/roms/Makefile index f4141e1d96..a6043eff37 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -83,12 +83,12 @@ build-seabios-config-%: config.% cp $< seabios/builds/$*/.config $(MAKE) -C seabios \ EXTRAVERSION=$(SEABIOS_EXTRAVERSION) \ - CROSS_COMPILE=$(x86_64_cross_prefix) \ + CROSS_PREFIX=$(x86_64_cross_prefix) \ KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \ OUT=$(CURDIR)/seabios/builds/$*/ oldnoconfig $(MAKE) -C seabios \ EXTRAVERSION=$(SEABIOS_EXTRAVERSION) \ - CROSS_COMPILE=$(x86_64_cross_prefix) \ + CROSS_PREFIX=$(x86_64_cross_prefix) \ KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \ OUT=$(CURDIR)/seabios/builds/$*/ all |