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

Unified Diff: libraries/openssl-1.0.0e/nacl-openssl-1.0.0e.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 | « libraries/openal-soft-1.13/nacl-openal-soft-1.13.sh ('k') | libraries/pango-1.29.3/nacl-pango-1.29.3.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libraries/openssl-1.0.0e/nacl-openssl-1.0.0e.sh
diff --git a/libraries/openssl-1.0.0e/nacl-openssl-1.0.0e.sh b/libraries/openssl-1.0.0e/nacl-openssl-1.0.0e.sh
index 1caced62494bf2dbc77a43df3f1967e1b06769c1..46980de84a681739f804c91037bcdd92792ae3b9 100755
--- a/libraries/openssl-1.0.0e/nacl-openssl-1.0.0e.sh
+++ b/libraries/openssl-1.0.0e/nacl-openssl-1.0.0e.sh
@@ -19,7 +19,7 @@ CustomConfigureStep() {
local extra_args=""
if [[ "${NACL_ARCH}" = "pnacl" ||
"${NACL_TOOLCHAIN_ROOT}" == *newlib* ]] ; then
- readonly GLIBC_COMPAT=${NACL_SDK_USR_INCLUDE}/glibc-compat
+ readonly GLIBC_COMPAT=${NACLPORTS_INCLUDE}/glibc-compat
if [[ ! -f ${GLIBC_COMPAT}/netdb.h ]]; then
echo "Please install glibc-compat first"
exit 1
@@ -29,7 +29,7 @@ CustomConfigureStep() {
ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}
MACHINE=i686 CC=${NACLCC} AR=${NACLAR} RANLIB=${NACLRANLIB} ./config \
- --prefix=${NACL_SDK_USR} no-asm no-hw no-krb5 ${extra_args} -D_GNU_SOURCE
+ --prefix=${NACLPORTS_PREFIX} no-asm no-hw no-krb5 ${extra_args} -D_GNU_SOURCE
}
CustomHackStepForNewlib() {
« no previous file with comments | « libraries/openal-soft-1.13/nacl-openal-soft-1.13.sh ('k') | libraries/pango-1.29.3/nacl-pango-1.29.3.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698