diff options
| author | Marco Vanotti <mvanotti@users.noreply.github.com> | 2019-04-22 10:51:48 -0700 |
|---|---|---|
| committer | Julia Hansbrough <flowerhack@google.com> | 2019-04-22 10:51:48 -0700 |
| commit | 4d3be36006c006fe859f4db89dfe396176eac12d (patch) | |
| tree | 163bd50fd9d1532ad4c0a5c71844f9d657c002eb | |
| parent | 2e55509e431d2adaa0e3f63179dfab4373417151 (diff) | |
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.
| -rw-r--r-- | pkg/build/fuchsia.go | 6 |
1 files changed, 3 insertions, 3 deletions
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)) |