diff options
| author | Aditya Basu <mitthu@google.com> | 2019-06-03 11:55:18 -0400 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-06-03 18:58:22 +0200 |
| commit | 4a4d36b4af219bf250467fede6d3d68b82101b9d (patch) | |
| tree | b1243f0491f1a454ed11c8feae1afd3ec9c64442 /pkg | |
| parent | 816587a771077c84b6c06ca93cc94fd656859b58 (diff) | |
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 <mitthu@google.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/akaros.go | 3 |
1 files changed, 1 insertions, 2 deletions
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"), }...) |