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

Unified Diff: examples/tools/thttpd-2.25b/gen_nmf.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/dosbox-0.74/nacl-dosbox-0.74.sh ('k') | examples/tools/thttpd-2.25b/nacl-thttpd-2.25b.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/tools/thttpd-2.25b/gen_nmf.sh
diff --git a/examples/tools/thttpd-2.25b/gen_nmf.sh b/examples/tools/thttpd-2.25b/gen_nmf.sh
index cdc1a41cd43ecc0c0bdb475c6da45f26f5e2a07b..dade8c2cc368a4ffadcc2b2d05bd1110e0d49a57 100755
--- a/examples/tools/thttpd-2.25b/gen_nmf.sh
+++ b/examples/tools/thttpd-2.25b/gen_nmf.sh
@@ -23,15 +23,17 @@ function nacl_configure {
fi
fi
- export NACL_PACKAGES_BITSIZE=${NACL_PACKAGES_BITSIZE:-"32"}
- if [ $NACL_PACKAGES_BITSIZE = "32" ] ; then
+ export NACL_ARCH=${NACL_ARCH:-"i686"}
+ if [ $NACL_ARCH = "i686" ] ; then
export ARCH=x86-32
export LARCH=i686
- elif [ $NACL_PACKAGES_BITSIZE = "64" ] ; then
+ export NACL_LIBDIR=lib32
+ elif [ $NACL_ARCH = "x86_64" ] ; then
export LARCH=x86_64
export ARCH=x86-64
+ export NACL_LIBDIR=lib64
else
- "Unknown value for NACL_PACKAGES_BITSIZE: '$NACL_PACKAGES_BITSIZE'"
+ "Unknown value for NACL_ARCH: '$NACL_ARCH'"
exit -1
fi
}
@@ -39,6 +41,6 @@ function nacl_configure {
nacl_configure
NACL_LIB_PATH=$NACL_TOOLCHAIN_ROOT/x86_64-nacl
$NACL_SDK_ROOT/tools/create_nmf.py \
- -L$NACL_LIB_PATH/usr/lib$NACL_PACKAGES_BITSIZE \
- -L$NACL_LIB_PATH/lib$NACL_PACKAGES_BITSIZE -o thttpd.nmf -s . \
- thttpd_x86-$NACL_PACKAGES_BITSIZE.nexe
+ -L$NACL_LIB_PATH/usr/$NACL_LIBDIR \
+ -L$NACL_LIB_PATH/$NACL_LIBDIR -o thttpd.nmf -s . \
+ thttpd_$NACL_ARCH
« no previous file with comments | « examples/systems/dosbox-0.74/nacl-dosbox-0.74.sh ('k') | examples/tools/thttpd-2.25b/nacl-thttpd-2.25b.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698