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

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: 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: 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 a33180ef2af9ce8c0cb545388bd80815c42abe18..a4166498074b481f076f32ba4262a19090d56d40 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
@@ -23,7 +23,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
@@ -33,7 +33,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() {

Powered by Google App Engine
This is Rietveld 408576698