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

Unified Diff: ports/scummvm/build.sh

Issue 1804293003: Add support for new pnacl native toolchain driver (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Fix according to Brad's comments Created 4 years, 8 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
Index: ports/scummvm/build.sh
diff --git a/ports/scummvm/build.sh b/ports/scummvm/build.sh
index 1c2853e89baadde59b65f0a2fa0b9d8be85f6bec..b0dc0f1492a7e27b40442cdb0e005f1adcf92eb0 100644
--- a/ports/scummvm/build.sh
+++ b/ports/scummvm/build.sh
@@ -23,7 +23,7 @@ ConfigureStep() {
SetupCrossEnvironment
local conf_host=${NACL_CROSS_PREFIX}
- if [ "${NACL_ARCH}" = "pnacl" ]; then
+ if [ "${NACL_ARCH}" = "pnacl" -o "${NACL_ARCH}" = "le32" ]; then
conf_host="pnacl"
elif [ "${NACL_ARCH}" = "arm" ]; then
conf_host="nacl-arm"
@@ -89,7 +89,7 @@ InstallStep() {
cp ${START_DIR}/packaged_app/* ${ASSEMBLY_DIR}
cp ${SRC_DIR}/*.tar ${ASSEMBLY_DIR}
- if [ "${NACL_DEBUG}" = "1" ]; then
+ if [ "${NACL_DEBUG}" = "1" -o ${NACL_ARCH} = "le32" ]; then
cp ${BUILD_DIR}/scummvm \
${ASSEMBLY_DIR}/scummvm_${NACL_ARCH}${NACL_EXEEXT}
else
@@ -102,7 +102,7 @@ InstallStep() {
-s ${ASSEMBLY_DIR} \
-o ${ASSEMBLY_DIR}/scummvm.nmf
- if [ "${NACL_ARCH}" = "pnacl" ]; then
+ if [ "${NACL_ARCH}" = "pnacl" -o "${NACL_ARCH}" = "le32" ]; then
sed -i.bak 's/x-nacl/x-pnacl/' ${ASSEMBLY_DIR}/index.html
fi
« make_all.sh ('K') | « ports/regal/nacl.patch ('k') | ports/sdl-tests/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698