diff options
| author | Marco Vanotti <mvanotti@google.com> | 2019-07-17 00:24:26 -0700 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-07-23 08:44:20 +0200 |
| commit | f171a40c6b33749432df7ba4b02771466a232f3b (patch) | |
| tree | 3830bed4281bd75435af1a92e1505eaac90960e8 /pkg/build/fuchsia.go | |
| parent | 1b0aeaa4e84be4449a73b24a0a57c04c02589a81 (diff) | |
pkg/build: change gcc for clang in fuchsia
Recently fuchsia changed the default compiler from GCC to clang. This
change updates the paths in the build package.
Diffstat (limited to 'pkg/build/fuchsia.go')
| -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 8553fbf99..850d02928 100644 --- a/pkg/build/fuchsia.go +++ b/pkg/build/fuchsia.go @@ -42,9 +42,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/" + arch + ".zircon/kernel-" + arch + "-gcc/obj/kernel/zircon.elf": "obj/zircon.elf", - "out/" + arch + ".zircon/multiboot.bin": "kernel", - "out/" + arch + "/fuchsia-ssh.zbi": "initrd", + "out/" + arch + ".zircon/kernel-" + arch + "-clang/obj/kernel/zircon.elf": "obj/zircon.elf", + "out/" + arch + ".zircon/multiboot.bin": "kernel", + "out/" + arch + "/fuchsia-ssh.zbi": "initrd", } { fullSrc := filepath.Join(kernelDir, filepath.FromSlash(src)) fullDst := filepath.Join(outputDir, filepath.FromSlash(dst)) |