From c219f89ca47a2bb27a22a2514536af61878c4275 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Thu, 5 Jul 2018 13:10:43 +0200
Subject: sys/targets: fix akaros path handling

make extract needs path to whole kernel, not just toolchains,
so assume that toolchains are in toolchains subdir in kernel.
---
 sys/targets/targets.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sys')

diff --git a/sys/targets/targets.go b/sys/targets/targets.go
index 59b66bd9e..854167873 100644
--- a/sys/targets/targets.go
+++ b/sys/targets/targets.go
@@ -191,8 +191,9 @@ var List = map[string]map[string]*Target{
 			PtrSize:           8,
 			PageSize:          4 << 10,
 			CArch:             []string{"__x86_64__"},
+			KernelHeaderArch:  "x86",
 			NeedSyscallDefine: dontNeedSyscallDefine,
-			CCompiler:         os.ExpandEnv("${SOURCEDIR}/x86_64-ucb-akaros-gcc/bin/x86_64-ucb-akaros-g++"),
+			CCompiler:         os.ExpandEnv("${SOURCEDIR}/toolchain/x86_64-ucb-akaros-gcc/bin/x86_64-ucb-akaros-g++"),
 			CrossCFlags: []string{
 				"-static",
 			},
-- 
cgit mrf-deployment