Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Unified Diff: build_tools/buildbot_selector.sh

Issue 1393343002: Improve emscripten download, install and auto-detection (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build_tools/download_emscripten.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build_tools/buildbot_selector.sh
diff --git a/build_tools/buildbot_selector.sh b/build_tools/buildbot_selector.sh
index 805ee38ab2bf26f2a269d617349388494fa0fb5a..ec7ad8ec6dada3e08635641c66d0d00383c06655 100755
--- a/build_tools/buildbot_selector.sh
+++ b/build_tools/buildbot_selector.sh
@@ -178,32 +178,6 @@ InstallEmscripten() {
git apply "${NACLPORTS_SRC}/emscripten.patch"
cd -
fi
-
- # Add the node 'bin' directory to the PATH.
- # TODO(sbc): probably cleaner to modify .emscripten file instead.
- local node_bin=${NACLPORTS_SRC}/out/node-v0.12.1-linux-x64/bin/
- if [ ! -d "${node_bin}" ]; then
- echo "node bin directory not found: ${node_bin}"
- exit 1
- fi
- echo "Adding node bin directory to PATH: ${node_bin}"
- export PATH=${PATH}:${node_bin}
-
- export EM_CONFIG=${EMSDK_ROOT}/.emscripten
- export EMSCRIPTEN=${EMSDK_ROOT}/emscripten
- echo "Setting EM_CONFIG: ${EM_CONFIG} EMSCRIPTEN: ${EMSCRIPTEN}"
-
- echo "Adding emscripten to PATH: ${EMSCRIPTEN_ROOT}"
- export PATH=${PATH}:${EMSCRIPTEN_ROOT}
-
- # Finally, run 'emcc -v' which will check that the compiler is working
- echo "Running emcc -v"
- emcc -v
-
- # Run using -O2 to compile the native js-optimizer
- touch ${NACLPORTS_SRC}/out/test.c
- emcc -O2 -o ${NACLPORTS_SRC}/out/test.js ${NACLPORTS_SRC}/out/test.c
- rm ${NACLPORTS_SRC}/out/test.{c,js}
}
Unittests() {
« no previous file with comments | « no previous file | build_tools/download_emscripten.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698