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

Unified Diff: build_tools/buildbot_selector.sh

Issue 11636027: Add ARM toolchain support. (Closed) Base URL: git@github.com:samclegg/naclports.git@sbc
Patch Set: revert .c file change Created 7 years, 11 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 | « build_tools/bots/windows/nacl-install-windows-ports-6.sh ('k') | build_tools/common.sh » ('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 17339c6154f6c5207de9a04281a1f3a7f3c62ecb..14eb4bf25e8dff4a074641c7a7fd19e36ddbebdf 100755
--- a/build_tools/buildbot_selector.sh
+++ b/build_tools/buildbot_selector.sh
@@ -18,8 +18,8 @@ export PATH=${PATH}:/opt/local/bin
StartBuild() {
cd $2
- export NACL_PACKAGES_BITSIZE=$3
- echo "@@@BUILD_STEP $3-bit setup@@@"
+ export NACL_ARCH=$3
+ echo "@@@BUILD_STEP $3 setup@@@"
if ! ./$1 ; then
RESULT=0
fi
@@ -40,7 +40,7 @@ else
fi
# This a temporary hack until the pnacl support is more mature
-if [ ${LIBC} == "pnacl_newlib" ] ; then
+if [ ${LIBC} = "pnacl_newlib" ] ; then
${SCRIPT_DIR}/bots/pnacl_bots.sh
exit 0
fi
@@ -65,9 +65,9 @@ else
fi
# Select libc
-if [ "$LIBC" == "glibc" ]; then
+if [ "$LIBC" = "glibc" ]; then
export NACL_GLIBC=1
-elif [ "$LIBC" == "newlib" ]; then
+elif [ "$LIBC" = "newlib" ]; then
export NACL_GLIBC=0
else
echo "Bad LIBC: ${LIBC}" 1>&2
@@ -91,10 +91,10 @@ echo "@@@BUILD_STEP Install Latest SDK@@@"
${PYTHON} build_tools/buildbot_sdk_setup.py
# Build 32-bit.
-StartBuild ${SCRIPT_NAME} ${SCRIPT_DIR}/bots/${BOT_OS_DIR} 32
+StartBuild ${SCRIPT_NAME} ${SCRIPT_DIR}/bots/${BOT_OS_DIR} i686
if [[ $RESULT != 0 ]]; then
# Build 64-bit.
- StartBuild ${SCRIPT_NAME} ${SCRIPT_DIR}/bots/${BOT_OS_DIR} 64
+ StartBuild ${SCRIPT_NAME} ${SCRIPT_DIR}/bots/${BOT_OS_DIR} x86_64
fi
exit 0
« no previous file with comments | « build_tools/bots/windows/nacl-install-windows-ports-6.sh ('k') | build_tools/common.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698