Merge branch 'master' into port-gcc
This commit is contained in:
commit
6868f18e46
|
@ -1,5 +1,6 @@
|
|||
third_party/pkg/
|
||||
third_party/src/github.com/kr/
|
||||
third_party/src/github.com/creack/
|
||||
third_party/src/golang.org/
|
||||
|
||||
*.build.log
|
||||
|
|
|
@ -42,7 +42,7 @@ if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then
|
|||
mv $JEHANNE/tmp/toolchain/* $JEHANNE/hacking/cross/toolchain/
|
||||
else
|
||||
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
|
||||
|
||||
|
|
|
@ -215,3 +215,4 @@ ln -sf /bin/bash $JEHANNE/hacking/cross/toolchain/bin/x86_64-jehanne-sh
|
|||
|
||||
kill $dotter
|
||||
wait $dotter 2>/dev/null
|
||||
echo "done."
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit b67405210112e709c0e790dcf57f3436c3d7835d
|
||||
Subproject commit fef060960822ab3d59c1b3d4125c7f33ace8217a
|
|
@ -13,7 +13,7 @@ import (
|
|||
"os"
|
||||
"os/exec"
|
||||
"strings"
|
||||
"github.com/kr/pty"
|
||||
"github.com/creack/pty"
|
||||
"golang.org/x/crypto/ssh/terminal"
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in New Issue