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

Unified Diff: examples/tools/thttpd-2.25b/nacl-thttpd-2.25b.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
Index: examples/tools/thttpd-2.25b/nacl-thttpd-2.25b.sh
diff --git a/examples/tools/thttpd-2.25b/nacl-thttpd-2.25b.sh b/examples/tools/thttpd-2.25b/nacl-thttpd-2.25b.sh
index 1b17eee3b9af57e983c8feeb549ea2d4a5632f97..a7d449ef12a8a7d57dc77edc7c7ffdeabab9d286 100755
--- a/examples/tools/thttpd-2.25b/nacl-thttpd-2.25b.sh
+++ b/examples/tools/thttpd-2.25b/nacl-thttpd-2.25b.sh
@@ -46,8 +46,8 @@ CustomBuildStep() {
fi
export AR=${NACLAR}
export RANLIB=${NACLRANLIB}
- 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};
local PACKAGE_DIR="${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}"
ChangeDir ${PACKAGE_DIR}
@@ -78,7 +78,7 @@ CustomInstallStep() {
$NACL_SDK_ROOT/tools/create_nmf.py \
-L$NACL_LIB_PATH/usr/lib$NACL_COMPLEMENT_LIBDIR \
-L$NACL_LIB_PATH/lib$NACL_COMPLEMENT_LIBDIR \
- -L$NACL_SDK_USR_LIB \
+ -L$NACLPORTS_LIBDIR \
-L$NACL_SDK_LIB \
-D$NACL_BIN_PATH/x86_64-nacl-objdump \
-o thttpd.nmf -s . \
@@ -86,7 +86,7 @@ CustomInstallStep() {
thttpd_${NACL_COMPLEMENT_ARCH}.nexe
else
$NACL_SDK_ROOT/tools/create_nmf.py \
- -L$NACL_SDK_USR_LIB \
+ -L$NACLPORTS_LIBDIR \
-L$NACL_SDK_LIB \
-D$NACL_BIN_PATH/x86_64-nacl-objdump \
-o thttpd.nmf -s . \
« no previous file with comments | « examples/systems/dosbox-0.74/nacl-dosbox-0.74.sh ('k') | libraries/FreeImage-3.14.1/nacl-FreeImage-3.14.1.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698