aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/travis-emscripten/build_emscripten.sh
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/travis-emscripten/build_emscripten.sh')
-rwxr-xr-xscripts/travis-emscripten/build_emscripten.sh16
1 files changed, 9 insertions, 7 deletions
diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh
index 5259dc7f..bf460e8e 100755
--- a/scripts/travis-emscripten/build_emscripten.sh
+++ b/scripts/travis-emscripten/build_emscripten.sh
@@ -34,11 +34,13 @@
set -ev
-# We need git for extracting the commit hash
-apt-get update
-apt-get -y install git-core
+if ! type git &>/dev/null; then
+ # We need git for extracting the commit hash
+ apt-get update
+ apt-get -y install git-core
+fi
-export WORKSPACE=/src
+WORKSPACE=/root/project
# Boost
echo -en 'travis_fold:start:compiling_boost\\r'
@@ -46,9 +48,9 @@ cd "$WORKSPACE"/boost_1_57_0
# if b2 exists, it is a fresh checkout, otherwise it comes from the cache
# and is already compiled
test -e b2 && (
-sed -i 's|using gcc ;|using gcc : : /usr/local/bin/em++ ;|g' ./project-config.jam
-sed -i 's|$(archiver\[1\])|/usr/local/bin/emar|g' ./tools/build/src/tools/gcc.jam
-sed -i 's|$(ranlib\[1\])|/usr/local/bin/emranlib|g' ./tools/build/src/tools/gcc.jam
+sed -i 's|using gcc ;|using gcc : : em++ ;|g' ./project-config.jam
+sed -i 's|$(archiver\[1\])|emar|g' ./tools/build/src/tools/gcc.jam
+sed -i 's|$(ranlib\[1\])|emranlib|g' ./tools/build/src/tools/gcc.jam
./b2 link=static variant=release threading=single runtime-link=static \
system regex filesystem unit_test_framework program_options
find . -name 'libboost*.a' -exec cp {} . \;