From 4d3be36006c006fe859f4db89dfe396176eac12d Mon Sep 17 00:00:00 2001 From: Marco Vanotti Date: Mon, 22 Apr 2019 10:51:48 -0700 Subject: pkg/build: update zircon build directory. (#1132) Recently, fuchsia changed the build directory for zircon, now instead of build-zircon, we have arch.zircon, where arch is x64 or arm64. --- pkg/build/fuchsia.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/build') diff --git a/pkg/build/fuchsia.go b/pkg/build/fuchsia.go index b363b4fb2..b8a7a8556 100644 --- a/pkg/build/fuchsia.go +++ b/pkg/build/fuchsia.go @@ -34,9 +34,9 @@ func (fu fuchsia) build(targetArch, vmType, kernelDir, outputDir, compiler, user for src, dst := range map[string]string{ "out/" + arch + "/obj/build/images/fvm.blk": "image", ".ssh/pkey": "key", - "out/build-zircon/kernel-" + arch + "-gcc/obj/kernel/zircon.elf": "obj/zircon.elf", - "out/build-zircon/multiboot.bin": "kernel", - "out/" + arch + "/fuchsia.zbi": "initrd", + "out/" + arch + ".zircon/kernel-" + arch + "-gcc/obj/kernel/zircon.elf": "obj/zircon.elf", + "out/" + arch + ".zircon/multiboot.bin": "kernel", + "out/" + arch + "/fuchsia.zbi": "initrd", } { fullSrc := filepath.Join(kernelDir, filepath.FromSlash(src)) fullDst := filepath.Join(outputDir, filepath.FromSlash(dst)) -- cgit mrf-deployment