wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

have toolchain script point to rebar correctly

Browse Source
This commit is contained in:
Abraham Gonzalez
2019-05-11 17:29:10 -07:00
parent e5d9f539c5
commit 2dbe087fce
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/build-toolchains.sh
View File

@@ -10,7 +10,7 @@ if [ ! -d "$HOME/esp-tools-install" ]; then
cd $HOME/ cd $HOME/
# init all submodules including the tools # init all submodules including the tools
./project/scripts/build-toolchains.sh esp-tools REBAR_DIR=$HOME/project ./project/scripts/build-toolchains.sh esp-tools
fi fi
if [ ! -d "$HOME/riscv-tools-install" ]; then if [ ! -d "$HOME/riscv-tools-install" ]; then
@@ -18,5 +18,5 @@ if [ ! -d "$HOME/riscv-tools-install" ]; then
cd $HOME/ cd $HOME/
# init all submodules including the tools # init all submodules including the tools
./project/scripts/build-toolchains.sh riscv-tools REBAR_DIR=$HOME/project ./project/scripts/build-toolchains.sh riscv-tools
fi fi

3
scripts/build-toolchains.sh
View File

@@ -6,6 +6,7 @@ set -o pipefail
unamestr=$(uname) unamestr=$(uname)
RDIR=$(pwd) RDIR=$(pwd)
: ${REBAR_DIR:=$(pwd)} #default value is the PWD unless overridden
if [ $# -ne 0 ]; then if [ $# -ne 0 ]; then
TOOLCHAIN=$1 TOOLCHAIN=$1
@@ -25,7 +26,7 @@ RISCV="$(pwd)/$INSTALL_DIR"
# install risc-v tools # install risc-v tools
export RISCV="$RISCV" export RISCV="$RISCV"
git submodule update --init --recursive toolchains/$TOOLCHAIN #--jobs 8 git -C $REBAR_DIR submodule update --init --recursive toolchains/$TOOLCHAIN #--jobs 8
cd "toolchains/$TOOLCHAIN" cd "toolchains/$TOOLCHAIN"
export MAKEFLAGS="-j16" export MAKEFLAGS="-j16"
./build.sh ./build.sh