JehanneOS
/
devtools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge branch 'master' into port-gcc

This commit is contained in:
Giacomo Tesio 2019-11-05 00:24:22 +01:00
parent 61806bacc9 14e9ad0fe7
commit 6868f18e46
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
third_party/pkg/ third_party/pkg/
third_party/src/github.com/kr/ third_party/src/github.com/kr/
third_party/src/github.com/creack/
third_party/src/golang.org/ third_party/src/golang.org/
*.build.log *.build.log

2
continuous-build.sh
View File

@ -42,7 +42,7 @@ if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then
mv $JEHANNE/tmp/toolchain/* $JEHANNE/hacking/cross/toolchain/ mv $JEHANNE/tmp/toolchain/* $JEHANNE/hacking/cross/toolchain/
else else
echo "Creating cross-compiling toolchain..." echo "Creating cross-compiling toolchain..."
(cd $JEHANNE/hacking/cross/; ./init.sh; git clean -xdf $JEHANNE/hacking/cross/tmp $JEHANNE/hacking/cross/src/) (cd $JEHANNE/hacking/cross/; ./init.sh; git clean -q -xdf $JEHANNE/hacking/cross/tmp $JEHANNE/hacking/cross/src/)
fi fi
fi fi

1
cross/init.sh
View File

@ -215,3 +215,4 @@ ln -sf /bin/bash $JEHANNE/hacking/cross/toolchain/bin/x86_64-jehanne-sh
kill $dotter kill $dotter
wait $dotter 2>/dev/null wait $dotter 2>/dev/null
echo "done."

2
cross/pkgs/newlib/src

@ -1 +1 @@
Subproject commit b67405210112e709c0e790dcf57f3436c3d7835d Subproject commit fef060960822ab3d59c1b3d4125c7f33ace8217a

2
src/jehanne/cmd/runqemu/runqemu.go
View File

@ -13,7 +13,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"strings" "strings"
"github.com/kr/pty" "github.com/creack/pty"
"golang.org/x/crypto/ssh/terminal" "golang.org/x/crypto/ssh/terminal"
) )