diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2018-07-04 10:15:56 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-07-05 10:44:34 +0200 |
| commit | d22578320115b163d9a47e102be04f12ebfa3da3 (patch) | |
| tree | 7510378958a56a69a1ece164e443da6f196f0c06 | |
| parent | 85bb4718fb01abc6ad3d055af095edbc46ee8ed9 (diff) | |
sys/targets: fix akaros compiler
Remote install dir from compiler path (install dir was my invention).
Remove additional flags, the compiler now seems to know own sysroot.
| -rw-r--r-- | sys/targets/targets.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/targets/targets.go b/sys/targets/targets.go index 633003aa7..59b66bd9e 100644 --- a/sys/targets/targets.go +++ b/sys/targets/targets.go @@ -192,14 +192,9 @@ var List = map[string]map[string]*Target{ PageSize: 4 << 10, CArch: []string{"__x86_64__"}, NeedSyscallDefine: dontNeedSyscallDefine, - CCompiler: os.ExpandEnv("${SOURCEDIR}/install/x86_64-ucb-akaros-gcc/bin/x86_64-ucb-akaros-g++"), - // Most likely this is incorrect (why doesn't it know own sysroot?), but worked for me. + CCompiler: os.ExpandEnv("${SOURCEDIR}/x86_64-ucb-akaros-gcc/bin/x86_64-ucb-akaros-g++"), CrossCFlags: []string{ "-static", - "-I", os.ExpandEnv("${SOURCEDIR}/tools/compilers/gcc-glibc/x86_64-ucb-akaros-gcc-stage3-builddir/x86_64-ucb-akaros/libstdc++-v3/include/x86_64-ucb-akaros"), - "-I", os.ExpandEnv("${SOURCEDIR}/tools/compilers/gcc-glibc/x86_64-ucb-akaros-gcc-stage3-builddir/x86_64-ucb-akaros/libstdc++-v3/include"), - "-I", os.ExpandEnv("${SOURCEDIR}/tools/compilers/gcc-glibc/gcc-4.9.2/libstdc++-v3/libsupc++"), - "-L", os.ExpandEnv("${SOURCEDIR}/tools/compilers/gcc-glibc/x86_64-ucb-akaros-gcc-stage3-builddir/x86_64-ucb-akaros/libstdc++-v3/src/.libs"), }, }, }, |