diff options
| author | Andrew Waterman <waterman@eecs.berkeley.edu> | 2016-06-29 17:37:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-29 17:37:13 -0700 |
| commit | 938b68df51ac5e794bd06a1db55b55be2620b3de (patch) | |
| tree | 4d690cb66bd649ab435fff9abb42f56d16f48ea6 | |
| parent | ca6df6287258145915065eba76618e832a4fb708 (diff) | |
| parent | 2603bbc11617b2f18a31522777604da7cad9b5e1 (diff) | |
| download | riscv-tools-938b68df51ac5e794bd06a1db55b55be2620b3de.zip riscv-tools-938b68df51ac5e794bd06a1db55b55be2620b3de.tar.gz riscv-tools-938b68df51ac5e794bd06a1db55b55be2620b3de.tar.bz2 | |
Merge pull request #34 from riscv/makeflags
Stop using "JOBS" and use "MAKEFLAGS" instead
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | build.common | 6 |
3 files changed, 4 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index c55137f..aadc439 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ addons: env: global: - RISCV="/home/travis/riscv_install" + - MAKEFLAGS="-j3" before_install: # make install destination @@ -206,12 +206,7 @@ environment variable now: $ export PATH=$PATH:$RISCV/bin -One more thing: If your machine doesn't have the capacity to -handle 16 make jobs (or conversely, it can handle more), edit -`build.common` to change the number specified by -`JOBS`. - - O$ sed -i 's/JOBS=16/JOBS=[number]/' build.common +The number of parallel compiler runs is set by `$MAKEFLAGS`. With everything else set up, run the build script. Recall that if you're using a new-version of gcc that isn't the default on your system, you'll need to precede the `./build.sh` with `CC=gcc-4.8 CXX=g++-4.8`: diff --git a/build.common b/build.common index 7a7e797..3b6a1c4 100644 --- a/build.common +++ b/build.common @@ -1,8 +1,6 @@ # Script to build RISC-V ISA simulator, proxy kernel, and GNU toolchain. # Tools will be installed to $RISCV. -JOBS=16 - if [ "x$RISCV" = "x" ] then echo "Please set the RISCV environment variable to your preferred install path." @@ -31,8 +29,8 @@ function build_project { echo "Configuring project $PROJECT" ../configure $* > build.log echo "Building project $PROJECT" - $MAKE -j$JOBS >> build.log + $MAKE >> build.log echo "Installing project $PROJECT" - $MAKE -j$JOBS install >> build.log + $MAKE install >> build.log cd - > /dev/null } |