From 4a4d36b4af219bf250467fede6d3d68b82101b9d Mon Sep 17 00:00:00 2001 From: Aditya Basu Date: Mon, 3 Jun 2019 11:55:18 -0400 Subject: pkg/build: update env variables for akaros * Remove the environment variable: AKAROS_XCC_ROOT (refer to commit: brho/akaros bdab8c3a) * Add environment variable AKAROS_TOOLCHAINS which points to the parent directory of the old AKAROS_XCC_ROOT. (refer to commit: brho/akaro 62ec5c3c) * Add "$AKAROS_TOOLCHAINS/x86_64-ucb-akaros-gcc/bin" to PATH. Signed-off-by: Aditya Basu --- pkg/build/akaros.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkg') diff --git a/pkg/build/akaros.go b/pkg/build/akaros.go index 59f8347a5..f4c9fe732 100644 --- a/pkg/build/akaros.go +++ b/pkg/build/akaros.go @@ -123,8 +123,7 @@ func (ctx akaros) cmd(kernelDir, runDir string, bin string, args ...string) erro cmd.Env = append(cmd.Env, []string{ "MAKE_JOBS=" + strconv.Itoa(runtime.NumCPU()), "AKAROS_ROOT=" + kernelDir, - "AKAROS_XCC_ROOT=" + filepath.Join(kernelDir, "toolchain", "x86_64-ucb-akaros-gcc"), - "X86_64_INSTDIR=" + filepath.Join(kernelDir, "toolchain", "x86_64-ucb-akaros-gcc"), + "AKAROS_TOOLCHAINS=" + filepath.Join(kernelDir, "toolchain"), "PATH=" + filepath.Join(kernelDir, "toolchain", "x86_64-ucb-akaros-gcc", "bin") + string(filepath.ListSeparator) + os.Getenv("PATH"), }...) -- cgit mrf-deployment