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

Unified Diff: examples/systems/bochs-2.4.6/nacl-bochs-2.4.6.sh

Issue 11885025: Allow re-targeting of naclports install (Closed) Base URL: http://naclports.googlecode.com/svn/trunk/src
Patch Set: rebase 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/needs_porting/xaos/xaos_tool.sh ('k') | examples/systems/dosbox-0.74/nacl-dosbox-0.74.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/systems/bochs-2.4.6/nacl-bochs-2.4.6.sh
diff --git a/examples/systems/bochs-2.4.6/nacl-bochs-2.4.6.sh b/examples/systems/bochs-2.4.6/nacl-bochs-2.4.6.sh
index 0860781b8ce6a01b110cc56498929f551eb9ef82..36cc466eaac7b466810702ee7f1efb354431b627 100755
--- a/examples/systems/bochs-2.4.6/nacl-bochs-2.4.6.sh
+++ b/examples/systems/bochs-2.4.6/nacl-bochs-2.4.6.sh
@@ -32,7 +32,7 @@ CustomConfigureStep() {
export CC=${NACLCC}
export CXX=${NACLCXX}
export CXXFLAGS="-O2 -g -I${NACL_SDK_ROOT}/include"
- export LDFLAGS=""
+ export LDFLAGS="${NACLPORTS_LDFLAGS}"
if [ ${NACL_ARCH} = "pnacl" ] ; then
export CXXFLAGS="-O3 -g"
export LDFLAGS="-O0 -static"
@@ -41,10 +41,10 @@ CustomConfigureStep() {
export RANLIB=${NACLRANLIB}
# path and package magic to make sure we call the right
# sdl-config, etc.
- export PKG_CONFIG_PATH=${NACL_SDK_USR_LIB}/pkgconfig
- export PKG_CONFIG_LIBDIR=${NACL_SDK_USR_LIB}
+ export PKG_CONFIG_PATH=${NACLPORTS_LIBDIR}/pkgconfig
+ export PKG_CONFIG_LIBDIR=${NACLPORTS_LIBDIR}
export PATH=${NACL_BIN_PATH}:${PATH};
- export PATH="${NACL_SDK_USR_BIN}:${PATH}"
+ export PATH="${NACLPORTS_PREFIX_BIN}:${PATH}"
export NACLBXLIBS="-lnacl-mounts -lpthread"
@@ -87,10 +87,10 @@ CustomConfigureStep() {
../configure \
--host=nacl \
--disable-shared \
- --prefix=${NACL_SDK_USR} \
- --exec-prefix=${NACL_SDK_USR} \
- --libdir=${NACL_SDK_USR_LIB} \
- --oldincludedir=${NACL_SDK_USR_INCLUDE} \
+ --prefix=${NACLPORTS_PREFIX} \
+ --exec-prefix=${NACLPORTS_PREFIX} \
+ --libdir=${NACLPORTS_LIBDIR} \
+ --oldincludedir=${NACLPORTS_INCLUDE} \
--with-x=no \
--with-x11=no \
--with-sdl=yes \
« no previous file with comments | « examples/needs_porting/xaos/xaos_tool.sh ('k') | examples/systems/dosbox-0.74/nacl-dosbox-0.74.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698