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

Unified Diff: examples/systems/dosbox-0.74/nacl-dosbox-0.74.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 | « examples/systems/bochs-2.4.6/nacl-bochs-2.4.6.sh ('k') | examples/tools/thttpd-2.25b/gen_nmf.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/systems/dosbox-0.74/nacl-dosbox-0.74.sh
diff --git a/examples/systems/dosbox-0.74/nacl-dosbox-0.74.sh b/examples/systems/dosbox-0.74/nacl-dosbox-0.74.sh
index 071b7891d46ed7a3f66bde3e9fc4b753e3fc6c96..ac9ebd1f54c5be000f4456cbb6f6bc9a5a16ba2d 100755
--- a/examples/systems/dosbox-0.74/nacl-dosbox-0.74.sh
+++ b/examples/systems/dosbox-0.74/nacl-dosbox-0.74.sh
@@ -29,7 +29,7 @@ CustomConfigureStep() {
# NOTE: non-standard flag NACL_LDFLAGS because of some more hacking below
export CXXFLAGS="-O2 -g"
export NACL_LDFLAGS=""
- if [ ${NACL_PACKAGES_BITSIZE} == "pnacl" ] ; then
+ if [ ${NACL_ARCH} = "pnacl" ] ; then
export CXXFLAGS="-O3 -g"
export NACL_LDFLAGS="-O0 -static"
fi
@@ -44,7 +44,7 @@ CustomConfigureStep() {
-lpng \
-lz"
- CONFIG_FLAGS="--host=${CROSS_ID}-pc-nacl \
+ CONFIG_FLAGS="--host=${NACL_ARCH}-pc-nacl \
--prefix=${NACL_SDK_USR} \
--exec-prefix=${NACL_SDK_USR} \
--libdir=${NACL_SDK_USR_LIB} \
@@ -100,7 +100,7 @@ CustomInstallStep(){
install ${START_DIR}/dosbox.html ${PUBLISH_DIR}
install ${START_DIR}/dosbox.nmf ${PUBLISH_DIR}
install ${DOSBOX_BUILD}/src/dosbox \
- ${PUBLISH_DIR}/dosbox_x86-${NACL_PACKAGES_BITSIZE}.nexe
+ ${PUBLISH_DIR}/dosbox_${NACL_ARCH}.nexe
DefaultTouchStep
}
@@ -111,7 +111,7 @@ CustomPackageInstall() {
DefaultPatchStep
CustomConfigureStep
DefaultBuildStep
- if [ ${NACL_PACKAGES_BITSIZE} == "pnacl" ] ; then
+ if [ ${NACL_ARCH} = "pnacl" ] ; then
DefaultTranslateStep ${PACKAGE_NAME} ${PACKAGE_NAME}-build/src/dosbox
fi
CustomInstallStep
« no previous file with comments | « examples/systems/bochs-2.4.6/nacl-bochs-2.4.6.sh ('k') | examples/tools/thttpd-2.25b/gen_nmf.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698