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

Unified Diff: libraries/openssl-1.0.0e/nacl-openssl-1.0.0e.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
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 753e5bfd7c980efcde0abbb7678a3c94965b4b5b..a33180ef2af9ce8c0cb545388bd80815c42abe18 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
@@ -21,8 +21,8 @@ source ../../build_tools/common.sh
CustomConfigureStep() {
Banner "Configuring ${PACKAGE_NAME}"
local extra_args=""
- if [[ "${NACL_PACKAGES_BITSIZE}" = "pnacl" ||
- "${NACL_TOOLCHAIN_ROOT}" == *newlib* ]] ; then
+ if [[ "${NACL_ARCH}" = "pnacl" ||
+ "${NACL_TOOLCHAIN_ROOT}" == *newlib* ]] ; then
readonly GLIBC_COMPAT=${NACL_SDK_USR_INCLUDE}/glibc-compat
if [[ ! -f ${GLIBC_COMPAT}/netdb.h ]]; then
echo "Please install glibc-compat first"
@@ -54,7 +54,7 @@ CustomPackageInstall() {
DefaultExtractStep
DefaultPatchStep
CustomConfigureStep
- if [[ "${NACL_PACKAGES_BITSIZE}" = "pnacl" ||
+ if [[ "${NACL_ARCH}" = "pnacl" ||
"${NACL_TOOLCHAIN_ROOT}" == *newlib* ]] ; then
CustomHackStepForNewlib
fi

Powered by Google App Engine
This is Rietveld 408576698